1 files changed, 182 insertions, 38 deletions

diff --git a/mail/evolution/pkg-plist b/mail/evolution/pkg-plist
index ff098223e06c..6bde06d3feab 100644
--- a/mail/evolution/pkg-plist
+++ b/mail/evolution/pkg-plist
@@ -1,5 +1,6 @@
 bin/evolution
 bin/evolution-addressbook
+bin/evolution-alarm-notify
 bin/evolution-calendar
 bin/evolution-executive-summary
 bin/evolution-gnomecard-importer
@@ -23,9 +24,9 @@ include/camel/camel-folder-search.h
 include/camel/camel-folder-summary.h
 include/camel/camel-folder-thread.h
 include/camel/camel-folder.h
-include/camel/camel-imap-auth.h
 include/camel/camel-imap-command.h
 include/camel/camel-imap-folder.h
+include/camel/camel-imap-message-cache.h
 include/camel/camel-imap-search.h
 include/camel/camel-imap-store.h
 include/camel/camel-imap-summary.h
@@ -52,6 +53,7 @@ include/camel/camel-mime-filter-bestenc.h
 include/camel/camel-mime-filter-charset.h
 include/camel/camel-mime-filter-crlf.h
 include/camel/camel-mime-filter-from.h
+include/camel/camel-mime-filter-html.h
 include/camel/camel-mime-filter-index.h
 include/camel/camel-mime-filter-linewrap.h
 include/camel/camel-mime-filter-save.h
@@ -64,10 +66,17 @@ include/camel/camel-mime-utils.h
 include/camel/camel-movemail.h
 include/camel/camel-multipart.h
 include/camel/camel-object.h
+include/camel/camel-operation.h
 include/camel/camel-pop3-folder.h
 include/camel/camel-pop3-store.h
 include/camel/camel-provider.h
 include/camel/camel-remote-store.h
+include/camel/camel-sasl-anonymous.h
+include/camel/camel-sasl-cram-md5.h
+include/camel/camel-sasl-digest-md5.h
+include/camel/camel-sasl-kerberos4.h
+include/camel/camel-sasl-plain.h
+include/camel/camel-sasl.h
 include/camel/camel-seekable-stream.h
 include/camel/camel-seekable-substream.h
 include/camel/camel-sendmail-transport.h
@@ -81,12 +90,17 @@ include/camel/camel-stream-fs.h
 include/camel/camel-stream-mem.h
 include/camel/camel-stream-null.h
 include/camel/camel-stream.h
+include/camel/camel-tcp-stream-openssl.h
+include/camel/camel-tcp-stream-raw.h
+include/camel/camel-tcp-stream-ssl.h
+include/camel/camel-tcp-stream.h
 include/camel/camel-transport.h
 include/camel/camel-types.h
 include/camel/camel-uid-cache.h
 include/camel/camel-url.h
 include/camel/camel-vee-folder.h
 include/camel/camel-vee-store.h
+include/camel/camel-vtrash-folder.h
 include/camel/camel.h
 include/camel/gstring-util.h
 include/camel/hash-table-utils.h
@@ -102,6 +116,7 @@ include/evolution/cal-util/cal-util.h
 include/evolution/cal-util/timeutil.h
 include/evolution/ebook/e-book-listener.h
 include/evolution/ebook/e-book-types.h
+include/evolution/ebook/e-book-util.h
 include/evolution/ebook/e-book-view-listener.h
 include/evolution/ebook/e-book-view.h
 include/evolution/ebook/e-book.h
@@ -110,10 +125,12 @@ include/evolution/ebook/e-card-pairs.h
 include/evolution/ebook/e-card-simple.h
 include/evolution/ebook/e-card-types.h
 include/evolution/ebook/e-card.h
+include/evolution/ebook/e-destination.h
 include/evolution/importer/GNOME_Evolution_Importer.h
 include/evolution/importer/evolution-importer-client.h
 include/evolution/importer/evolution-importer-listener.h
 include/evolution/importer/evolution-importer.h
+include/evolution/importer/evolution-intelligent-importer.h
 include/ical.h
 include/libicalvcal/icalvcal.h
 include/libicalvcal/port.h
@@ -122,16 +139,37 @@ include/libicalvcal/vcc.h
 include/libicalvcal/vobject.h
 lib/evolution/camel-providers/%%VERSION%%/libcamelimap.so
 lib/evolution/camel-providers/%%VERSION%%/libcamelimap.urls
+lib/evolution/camel-providers/%%VERSION%%/libcamellocal.a
 lib/evolution/camel-providers/%%VERSION%%/libcamellocal.so
+lib/evolution/camel-providers/%%VERSION%%/libcamellocal.so.0
 lib/evolution/camel-providers/%%VERSION%%/libcamellocal.urls
+lib/evolution/camel-providers/%%VERSION%%/libcamelpop3.a
 lib/evolution/camel-providers/%%VERSION%%/libcamelpop3.so
+lib/evolution/camel-providers/%%VERSION%%/libcamelpop3.so.0
 lib/evolution/camel-providers/%%VERSION%%/libcamelpop3.urls
+lib/evolution/camel-providers/%%VERSION%%/libcamelsendmail.a
 lib/evolution/camel-providers/%%VERSION%%/libcamelsendmail.so
+lib/evolution/camel-providers/%%VERSION%%/libcamelsendmail.so.0
 lib/evolution/camel-providers/%%VERSION%%/libcamelsendmail.urls
+lib/evolution/camel-providers/%%VERSION%%/libcamelsmtp.a
 lib/evolution/camel-providers/%%VERSION%%/libcamelsmtp.so
+lib/evolution/camel-providers/%%VERSION%%/libcamelsmtp.so.0
 lib/evolution/camel-providers/%%VERSION%%/libcamelsmtp.urls
-lib/evolution/camel-providers/%%VERSION%%/libcamelvee.so
-lib/evolution/camel-providers/%%VERSION%%/libcamelvee.urls
+lib/evolution/evolution-mail-importers/%%VERSION%%/libiielm.a
+lib/evolution/evolution-mail-importers/%%VERSION%%/libiielm.so
+lib/evolution/evolution-mail-importers/%%VERSION%%/libiielm.so.0
+lib/evolution/evolution-mail-importers/%%VERSION%%/libiinetscape.a
+lib/evolution/evolution-mail-importers/%%VERSION%%/libiinetscape.so
+lib/evolution/evolution-mail-importers/%%VERSION%%/libiinetscape.so.0
+lib/evolution/evolution-mail-importers/%%VERSION%%/libiipine.a
+lib/evolution/evolution-mail-importers/%%VERSION%%/libiipine.so
+lib/evolution/evolution-mail-importers/%%VERSION%%/libiipine.so.0
+lib/evolution/evolution-mail-importers/%%VERSION%%/libmbox.a
+lib/evolution/evolution-mail-importers/%%VERSION%%/libmbox.so
+lib/evolution/evolution-mail-importers/%%VERSION%%/libmbox.so.0
+lib/evolution/evolution-mail-importers/%%VERSION%%/liboutlook.a
+lib/evolution/evolution-mail-importers/%%VERSION%%/liboutlook.so
+lib/evolution/evolution-mail-importers/%%VERSION%%/liboutlook.so.0
 lib/libcal-client.a
 lib/libcal-client.so
 lib/libcal-client.so.0
@@ -177,6 +215,7 @@ share/gnome/evolution/default_user/local/Outbox/folder-metadata.xml
 share/gnome/evolution/default_user/local/Sent/folder-metadata.xml
 share/gnome/evolution/default_user/local/Tasks/folder-metadata.xml
 share/gnome/evolution/default_user/local/Trash/folder-metadata.xml
+share/gnome/evolution/default_user/searches.xml
 share/gnome/evolution/default_user/shortcuts.xml
 share/gnome/evolution/ecps/medbook.ecps
 share/gnome/evolution/ecps/phonelist.ecps
@@ -206,6 +245,31 @@ share/gnome/evolution/glade/select-names.glade
 share/gnome/evolution/glade/task-editor-dialog.glade
 share/gnome/evolution/summary.html
 share/gnome/evolution/vfoldertypes.xml
+share/gnome/evolution/views/addressbook/By_Company.galview
+share/gnome/evolution/views/addressbook/Phone_List.galview
+share/gnome/evolution/views/addressbook/galview.xml
+share/gnome/evolution/views/mail/By_Sender.galview
+share/gnome/evolution/views/mail/By_Status.galview
+share/gnome/evolution/views/mail/By_Subject.galview
+share/gnome/evolution/views/mail/Messages.galview
+share/gnome/evolution/views/mail/galview.xml
+share/gnome/evolution/views/tasks/Tasks.galview
+share/gnome/evolution/views/tasks/With_Category.galview
+share/gnome/evolution/views/tasks/galview.xml
+share/gnome/help/evolution/C/aboutbook.html
+share/gnome/help/evolution/C/apx-gloss.html
+share/gnome/help/evolution/C/authors.html
+share/gnome/help/evolution/C/bugs.html
+share/gnome/help/evolution/C/commontasks.html
+share/gnome/help/evolution/C/config-prefs-cal.html
+share/gnome/help/evolution/C/config-prefs-contact.html
+share/gnome/help/evolution/C/config-prefs-general.html
+share/gnome/help/evolution/C/config-prefs.html
+share/gnome/help/evolution/C/config-setupassist.html
+share/gnome/help/evolution/C/config-sync.html
+share/gnome/help/evolution/C/config.html
+share/gnome/help/evolution/C/docbook.css
+share/gnome/help/evolution/C/exec-services-detail.html
 share/gnome/help/evolution/C/fig/calendar.png
 share/gnome/help/evolution/C/fig/config-cal.png
 share/gnome/help/evolution/C/fig/config-mail.png
@@ -220,6 +284,49 @@ share/gnome/help/evolution/C/fig/mainwindow-pic.png
 share/gnome/help/evolution/C/fig/print-dest.png
 share/gnome/help/evolution/C/fig/print-preview.png
 share/gnome/help/evolution/C/fig/vfolder-createrule-fig.png
+share/gnome/help/evolution/C/index.html
+share/gnome/help/evolution/C/introduction.html
+share/gnome/help/evolution/C/ln15.html
+share/gnome/help/evolution/C/menuref-cal-editor.html
+share/gnome/help/evolution/C/menuref-cal.html
+share/gnome/help/evolution/C/menuref-contact-editor.html
+share/gnome/help/evolution/C/menuref-exec.html
+share/gnome/help/evolution/C/menuref-mail-editor.html
+share/gnome/help/evolution/C/menuref-mail.html
+share/gnome/help/evolution/C/menuref.html
+share/gnome/help/evolution/C/p2089.html
+share/gnome/help/evolution/C/print-destination.html
+share/gnome/help/evolution/C/stylesheet-images/caution.gif
+share/gnome/help/evolution/C/stylesheet-images/home.gif
+share/gnome/help/evolution/C/stylesheet-images/important.gif
+share/gnome/help/evolution/C/stylesheet-images/next.gif
+share/gnome/help/evolution/C/stylesheet-images/note.gif
+share/gnome/help/evolution/C/stylesheet-images/prev.gif
+share/gnome/help/evolution/C/stylesheet-images/tip.gif
+share/gnome/help/evolution/C/stylesheet-images/toc-blank.gif
+share/gnome/help/evolution/C/stylesheet-images/toc-minus.gif
+share/gnome/help/evolution/C/stylesheet-images/toc-plus.gif
+share/gnome/help/evolution/C/stylesheet-images/up.gif
+share/gnome/help/evolution/C/stylesheet-images/warning.gif
+share/gnome/help/evolution/C/usage-calendar-apts.html
+share/gnome/help/evolution/C/usage-calendar-multiple.html
+share/gnome/help/evolution/C/usage-calendar-todo.html
+share/gnome/help/evolution/C/usage-calendar.html
+share/gnome/help/evolution/C/usage-contact-automate.html
+share/gnome/help/evolution/C/usage-contact-cards.html
+share/gnome/help/evolution/C/usage-contact-organize.html
+share/gnome/help/evolution/C/usage-contact-sharing.html
+share/gnome/help/evolution/C/usage-contact.html
+share/gnome/help/evolution/C/usage-exec-summary.html
+share/gnome/help/evolution/C/usage-mail-organize.html
+share/gnome/help/evolution/C/usage-mail.html
+share/gnome/help/evolution/C/usage-mainwindow-folderbar.html
+share/gnome/help/evolution/C/usage-mainwindow-menubar.html
+share/gnome/help/evolution/C/usage-mainwindow.html
+share/gnome/help/evolution/C/usage-print.html
+share/gnome/help/evolution/C/usage-sync.html
+share/gnome/help/evolution/C/usage.html
+share/gnome/help/evolution/C/x2913.html
 share/gnome/html/evolution-cal-client-decl.txt
 share/gnome/html/evolution-cal-client-sections.txt
 share/gnome/html/evolution-cal-client.args
@@ -238,16 +345,13 @@ share/gnome/html/evolution-services.args
 share/gnome/html/evolution-services.hierarchy
 share/gnome/html/evolution-services.signals
 share/gnome/html/evolution-services.types
-share/gnome/html/evolution-shell-importer-sections.txt
-share/gnome/html/evolution-shell-importer.args
-share/gnome/html/evolution-shell-importer.hierarchy
-share/gnome/html/evolution-shell-importer.types
 share/gnome/idl/Composer.idl
 share/gnome/idl/Evolution-Composer.idl
 share/gnome/idl/Evolution-LocalStorage.idl
 share/gnome/idl/Evolution-Session.idl
 share/gnome/idl/Evolution-Shell.idl
 share/gnome/idl/Evolution-ShellComponent.idl
+share/gnome/idl/Evolution-ShellComponentDnd.idl
 share/gnome/idl/Evolution-ShellView.idl
 share/gnome/idl/Evolution-Storage.idl
 share/gnome/idl/Evolution-StorageSetView.idl
@@ -255,41 +359,44 @@ share/gnome/idl/Evolution.idl
 share/gnome/idl/GNOME_Evolution_Importer.idl
 share/gnome/idl/addressbook.idl
 share/gnome/idl/evolution-calendar.idl
-share/gnome/images/evolution/16_configure_addressbook.xpm
-share/gnome/images/evolution/16_configure_folder.xpm
-share/gnome/images/evolution/16_configure_mail.xpm
-share/gnome/images/evolution/16_copy_message.xpm
-share/gnome/images/evolution/16_edit.xpm
-share/gnome/images/evolution/16_encrypt.xpm
-share/gnome/images/evolution/16_forward.xpm
-share/gnome/images/evolution/16_move_message.xpm
-share/gnome/images/evolution/16_print.xpm
-share/gnome/images/evolution/16_reply.xpm
-share/gnome/images/evolution/16_reply_to_all.xpm
-share/gnome/images/evolution/16_save.xpm
-share/gnome/images/evolution/24_all_contacts.xpm
-share/gnome/images/evolution/24_find_contact.xpm
+share/gnome/images/evolution/all_contacts.xpm
 share/gnome/images/evolution/briefcase.png
 share/gnome/images/evolution/butterfly.png
 share/gnome/images/evolution/buttons/add-service.png
 share/gnome/images/evolution/buttons/compose-message.png
 share/gnome/images/evolution/buttons/copy-message.png
+share/gnome/images/evolution/buttons/dayview.xpm
 share/gnome/images/evolution/buttons/fetch-mail.png
 share/gnome/images/evolution/buttons/forward.png
+share/gnome/images/evolution/buttons/monthview.xpm
 share/gnome/images/evolution/buttons/move-message.png
+share/gnome/images/evolution/buttons/new_appointment.png
 share/gnome/images/evolution/buttons/reply-to-all.png
 share/gnome/images/evolution/buttons/reply.png
+share/gnome/images/evolution/buttons/send-24-receive.png
+share/gnome/images/evolution/buttons/weekview.xpm
+share/gnome/images/evolution/buttons/workweekview.xpm
+share/gnome/images/evolution/buttons/yearview.xpm
 share/gnome/images/evolution/cellphone.png
-share/gnome/images/evolution/conduits/16_evo-address-conduit.png
-share/gnome/images/evolution/conduits/16_evo-calendar-conduit.png
-share/gnome/images/evolution/conduits/16_evo-todo-conduit.png
-share/gnome/images/evolution/conduits/48_evo-address-conduit.png
-share/gnome/images/evolution/conduits/48_evo-calendar-conduit.png
-share/gnome/images/evolution/conduits/48_evo-todo-conduit.png
+share/gnome/images/evolution/conduits/evo-16-address-conduit.png
+share/gnome/images/evolution/conduits/evo-16-calendar-conduit.png
+share/gnome/images/evolution/conduits/evo-16-todo-conduit.png
+share/gnome/images/evolution/conduits/evo-48-address-conduit.png
+share/gnome/images/evolution/conduits/evo-48-calendar-conduit.png
+share/gnome/images/evolution/conduits/evo-48-todo-conduit.png
+share/gnome/images/evolution/configure_16_addressbook.xpm
+share/gnome/images/evolution/configure_16_calendar.xpm
+share/gnome/images/evolution/configure_16_folder.xpm
+share/gnome/images/evolution/configure_16_mail.xpm
+share/gnome/images/evolution/copy_16_message.xpm
+share/gnome/images/evolution/delete_message.xpm
+share/gnome/images/evolution/edit.xpm
+share/gnome/images/evolution/encrypt.xpm
 share/gnome/images/evolution/envelope.png
 share/gnome/images/evolution/evolution-calendar-mini.png
 share/gnome/images/evolution/evolution-calendar.png
 share/gnome/images/evolution/evolution-contacts-mini.png
+share/gnome/images/evolution/evolution-contacts-plain.png
 share/gnome/images/evolution/evolution-contacts.png
 share/gnome/images/evolution/evolution-inbox-mini.png
 share/gnome/images/evolution/evolution-inbox.png
@@ -297,12 +404,33 @@ share/gnome/images/evolution/evolution-notes-mini.png
 share/gnome/images/evolution/evolution-notes.png
 share/gnome/images/evolution/evolution-tasks-mini.png
 share/gnome/images/evolution/evolution-tasks.png
+share/gnome/images/evolution/evolution-today-mini.png
 share/gnome/images/evolution/evolution-today.png
+share/gnome/images/evolution/evolution-trash-mini.png
+share/gnome/images/evolution/evolution-trash.png
 share/gnome/images/evolution/executive-summary-bg.png
 share/gnome/images/evolution/executive-summary-curve.png
+share/gnome/images/evolution/find_contact.xpm
+share/gnome/images/evolution/folder.xpm
+share/gnome/images/evolution/forward.xpm
 share/gnome/images/evolution/globe.png
+share/gnome/images/evolution/hide_deleted_messages.xpm
+share/gnome/images/evolution/hide_read_messages.xpm
+share/gnome/images/evolution/hide_selected_messages.xpm
 share/gnome/images/evolution/house.png
+share/gnome/images/evolution/import.png
+share/gnome/images/evolution/import.xpm
 share/gnome/images/evolution/malehead.png
+share/gnome/images/evolution/move_message.xpm
+share/gnome/images/evolution/new-message.xpm
+share/gnome/images/evolution/new_appointment.xpm
+share/gnome/images/evolution/new_contact.xpm
+share/gnome/images/evolution/print-preview.xpm
+share/gnome/images/evolution/print.xpm
+share/gnome/images/evolution/reply.xpm
+share/gnome/images/evolution/reply_to_all.xpm
+share/gnome/images/evolution/save.xpm
+share/gnome/images/evolution/send-receive.xpm
 share/gnome/images/evolution/service-close.png
 share/gnome/images/evolution/service-configure.png
 share/gnome/images/evolution/service-down-disabled.png
@@ -313,19 +441,28 @@ share/gnome/images/evolution/service-right-disabled.png
 share/gnome/images/evolution/service-right.png
 share/gnome/images/evolution/service-up-disabled.png
 share/gnome/images/evolution/service-up.png
+share/gnome/images/evolution/show_all_messages.xpm
 share/gnome/images/evolution/splash.png
+share/gnome/images/evolution/undelete_message.xpm
+share/gnome/images/evolution/work_offline.xpm
 share/gnome/mime-info/evolution.keys
-share/gnome/oaf/GNOME_Evolution_Addressbook.oafinfo
-share/gnome/oaf/GNOME_Evolution_Addressbook_GnomeCard_Importer.oafinfo
-share/gnome/oaf/GNOME_Evolution_Addressbook_SelectNames.oafinfo
-share/gnome/oaf/GNOME_Evolution_Calendar.oafinfo
-share/gnome/oaf/GNOME_Evolution_Calendar_Control.oafinfo
-share/gnome/oaf/GNOME_Evolution_Mail.oafinfo
-share/gnome/oaf/GNOME_Evolution_Shell.oafinfo
-share/gnome/oaf/GNOME_Evolution_Summary.oafinfo
-share/gnome/oaf/GNOME_Evolution_Summary_rdf.oafinfo
-share/gnome/oaf/GNOME_Evolution_Summary_test.oafinfo
-share/gnome/oaf/GNOME_Evolution_Wombat.oafinfo
+share/gnome/mime-info/evolution.mime
+share/gnome/oaf/GNOME_Evolution_Addressbook.oaf
+share/gnome/oaf/GNOME_Evolution_Addressbook_GnomeCard_Importer.oaf
+share/gnome/oaf/GNOME_Evolution_Addressbook_SelectNames.oaf
+share/gnome/oaf/GNOME_Evolution_Calendar.oaf
+share/gnome/oaf/GNOME_Evolution_Calendar_AlarmNotify.oaf
+share/gnome/oaf/GNOME_Evolution_Mail.oaf
+share/gnome/oaf/GNOME_Evolution_Mail_Elm_Intelligent_Importer.oaf
+share/gnome/oaf/GNOME_Evolution_Mail_Mbox_Importer.oaf
+share/gnome/oaf/GNOME_Evolution_Mail_Netscape_Intelligent_Importer.oaf
+share/gnome/oaf/GNOME_Evolution_Mail_Outlook_Importer.oaf
+share/gnome/oaf/GNOME_Evolution_Mail_Pine_Intelligent_Importer.oaf
+share/gnome/oaf/GNOME_Evolution_Shell.oaf
+share/gnome/oaf/GNOME_Evolution_Summary.oaf
+share/gnome/oaf/GNOME_Evolution_Summary_rdf.oaf
+share/gnome/oaf/GNOME_Evolution_Summary_test.oaf
+share/gnome/oaf/GNOME_Evolution_Wombat.oaf
 share/gnome/pixmaps/evolution.png
 share/gnome/ui/evolution-addressbook.xml
 share/gnome/ui/evolution-calendar.xml
@@ -338,6 +475,7 @@ share/gnome/ui/evolution-subscribe.xml
 share/gnome/ui/evolution-task-editor-dialog.xml
 share/gnome/ui/evolution-tasks.xml
 share/gnome/ui/evolution.xml
+share/locale/az/LC_MESSAGES/evolution.mo
 share/locale/ca/LC_MESSAGES/evolution.mo
 share/locale/da/LC_MESSAGES/evolution.mo
 share/locale/de/LC_MESSAGES/evolution.mo
@@ -373,6 +511,10 @@ share/locale/uk/LC_MESSAGES/evolution.mo
 @dirrm share/gnome/help/evolution/C/fig
 @dirrm share/gnome/help/evolution/C
 @dirrm share/gnome/help/evolution
+@dirrm share/gnome/evolution/views/tasks
+@dirrm share/gnome/evolution/views/mail
+@dirrm share/gnome/evolution/views/addressbook
+@dirrm share/gnome/evolution/views
 @dirrm share/gnome/evolution/glade
 @dirrm share/gnome/evolution/ecps
 @dirrm share/gnome/evolution/default_user/news
@@ -388,6 +530,8 @@ share/locale/uk/LC_MESSAGES/evolution.mo
 @dirrm share/gnome/evolution/default_user/local
 @dirrm share/gnome/evolution/default_user
 @dirrm share/gnome/evolution
+@dirrm lib/evolution/evolution-mail-importers/%%VERSION%%
+@dirrm lib/evolution/evolution-mail-importers
 @dirrm lib/evolution/camel-providers/%%VERSION%%
 @dirrm lib/evolution/camel-providers
 @dirrm lib/evolution