diff -Nru evolution-data-server-2.24.1/addressbook/backends/groupwise/e-book-backend-groupwise.c evolution-data-server-2.24.1.1/addressbook/backends/groupwise/e-book-backend-groupwise.c --- evolution-data-server-2.24.1/addressbook/backends/groupwise/e-book-backend-groupwise.c 2008-10-13 10:08:23.000000000 +0200 +++ evolution-data-server-2.24.1.1/addressbook/backends/groupwise/e-book-backend-groupwise.c 2008-11-07 07:38:23.000000000 +0100 @@ -3512,10 +3512,6 @@ if (offline && g_str_equal (offline, "1")) priv->marked_for_offline = TRUE; - if (priv->mode == GNOME_Evolution_Addressbook_MODE_LOCAL && !priv->marked_for_offline ) { - return GNOME_Evolution_Addressbook_OfflineUnavailable; - } - uri = e_source_get_uri (source); priv->original_uri = g_strdup (uri); if(uri == NULL) @@ -3538,19 +3534,8 @@ priv->uri = g_strconcat ("https://", parsed_uri->host,":", port, "/soap", NULL ); else priv->uri = g_strconcat ("http://", parsed_uri->host,":", port, "/soap", NULL ); - priv->use_ssl = g_strdup (use_ssl); - priv->only_if_exists = only_if_exists; priv->book_name = book_name; - e_book_backend_set_is_loaded (E_BOOK_BACKEND (backend), TRUE); - e_book_backend_set_is_writable (E_BOOK_BACKEND(backend), FALSE); - if (priv->mode == GNOME_Evolution_Addressbook_MODE_LOCAL) { - e_book_backend_notify_writable (backend, FALSE); - e_book_backend_notify_connection_status (backend, FALSE); - } - else { - e_book_backend_notify_connection_status (backend, TRUE); - } for (i = 0; i < strlen (uri); i++) { switch (uri[i]) { @@ -3560,14 +3545,7 @@ } } - if (priv->mode == GNOME_Evolution_Addressbook_MODE_LOCAL) - if (!e_book_backend_db_cache_exists (priv->original_uri)) { - g_free (uri); - e_uri_free (parsed_uri); - return GNOME_Evolution_Addressbook_OfflineUnavailable; - } - - g_free (priv->summary_file_name); + g_free (priv->summary_file_name); tmp = g_build_filename (g_get_home_dir(), ".evolution/addressbook" , uri, priv->book_name, NULL); priv->summary_file_name = g_strconcat (tmp, ".summary", NULL); g_free (tmp); @@ -3674,6 +3652,30 @@ return GNOME_Evolution_Addressbook_OtherError; } + if (priv->mode == GNOME_Evolution_Addressbook_MODE_LOCAL && !priv->marked_for_offline ) { + return GNOME_Evolution_Addressbook_OfflineUnavailable; + } + + priv->use_ssl = g_strdup (use_ssl); + priv->only_if_exists = only_if_exists; + + e_book_backend_set_is_loaded (E_BOOK_BACKEND (backend), TRUE); + e_book_backend_set_is_writable (E_BOOK_BACKEND(backend), FALSE); + if (priv->mode == GNOME_Evolution_Addressbook_MODE_LOCAL) { + e_book_backend_notify_writable (backend, FALSE); + e_book_backend_notify_connection_status (backend, FALSE); + } + else { + e_book_backend_notify_connection_status (backend, TRUE); + } + + if (priv->mode == GNOME_Evolution_Addressbook_MODE_LOCAL) + if (!e_book_backend_db_cache_exists (priv->original_uri)) { + g_free (uri); + e_uri_free (parsed_uri); + return GNOME_Evolution_Addressbook_OfflineUnavailable; + } + e_book_backend_db_cache_set_filename (ebgw->priv->file_db, filename); if (priv->marked_for_offline) ebgw->priv->is_cache_ready = TRUE; diff -Nru evolution-data-server-2.24.1/addressbook/backends/ldap/e-book-backend-ldap.c evolution-data-server-2.24.1.1/addressbook/backends/ldap/e-book-backend-ldap.c --- evolution-data-server-2.24.1/addressbook/backends/ldap/e-book-backend-ldap.c 2008-10-13 10:08:23.000000000 +0200 +++ evolution-data-server-2.24.1.1/addressbook/backends/ldap/e-book-backend-ldap.c 2008-11-07 05:34:24.000000000 +0100 @@ -664,7 +664,7 @@ /* yuck. we have to free these? */ for (i = 0; info.ldapai_extensions[i]; i++) { char *extension = info.ldapai_extensions[i]; - g_message (extension); + g_message ("%s", extension); ldap_memfree (extension); } ldap_memfree (info.ldapai_extensions); diff -Nru evolution-data-server-2.24.1/addressbook/ChangeLog evolution-data-server-2.24.1.1/addressbook/ChangeLog --- evolution-data-server-2.24.1/addressbook/ChangeLog 2008-10-20 05:28:11.000000000 +0200 +++ evolution-data-server-2.24.1.1/addressbook/ChangeLog 2008-11-07 07:38:23.000000000 +0100 @@ -1,3 +1,29 @@ +2008-11-07 Sankar P + + ** Patch committed on behalf of Ashish Shrivastava + + ** Part of fix for bug bnc #435964 + + * backends/groupwise/e-book-backend-groupwise.c + (e_book_backend_groupwise_load_source): + emit_async_generic response crash fix. + +2008-11-03 Milan Crha + + ** Fix for bug #532136 + + * libebook/e-book.c: (e_book_op_remove): Remove operation from idle + queue when still there in time of its removal. + * libebook/e-book.c: (kill_remaining_ops), (e_book_dispose): + Free pending operations in time of dispose properly. + +2008-10-31 Matthew Barnes + + ** Fixes part of bug #558727 (patch by Frederic van Starbmann) + + * backends/ldap/e-book-backend-ldap.c (get_ldap_library_info): + Fix a potential string format crash. + 2008-10-17 Milan Crha ** Part of fix for bug #364542 diff -Nru evolution-data-server-2.24.1/addressbook/libebook/e-book.c evolution-data-server-2.24.1.1/addressbook/libebook/e-book.c --- evolution-data-server-2.24.1/addressbook/libebook/e-book.c 2008-10-20 05:28:11.000000000 +0200 +++ evolution-data-server-2.24.1.1/addressbook/libebook/e-book.c 2008-11-07 05:34:23.000000000 +0100 @@ -213,6 +213,13 @@ { g_hash_table_remove (book->priv->id_to_op, &op->opid); + + if (op->idle_id && g_list_find (book->priv->pending_idles, GINT_TO_POINTER (op->idle_id))) { + book->priv->pending_idles = g_list_remove (book->priv->pending_idles, + GINT_TO_POINTER (op->idle_id)); + g_source_remove (op->idle_id); + op->idle_id = 0; + } } static void @@ -3953,6 +3960,18 @@ } static void +kill_remaining_ops (gpointer key, gpointer value, gpointer user_data) +{ + EBookOp *op = value; + + if (!op) + return; + + find_key_value (key, value, NULL); + e_book_clear_op (op->book, op); +} + +static void e_book_init (EBook *book) { book->priv = g_new0 (EBookPrivate, 1); @@ -4006,8 +4025,10 @@ if (book->priv->source) g_object_unref (book->priv->source); - /* XXX free up the remaining ops? */ + g_mutex_lock (book->priv->mutex); + g_hash_table_foreach (book->priv->id_to_op, kill_remaining_ops, NULL); g_hash_table_destroy (book->priv->id_to_op); + g_mutex_unlock (book->priv->mutex); g_mutex_free (book->priv->mutex); diff -Nru evolution-data-server-2.24.1/calendar/backends/caldav/e-cal-backend-caldav.c evolution-data-server-2.24.1.1/calendar/backends/caldav/e-cal-backend-caldav.c --- evolution-data-server-2.24.1/calendar/backends/caldav/e-cal-backend-caldav.c 2008-10-13 10:08:29.000000000 +0200 +++ evolution-data-server-2.24.1.1/calendar/backends/caldav/e-cal-backend-caldav.c 2008-11-07 05:34:24.000000000 +0100 @@ -1,23 +1,25 @@ -/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- - * ex: set ts=8: */ -/* Evolution calendar - caldav backend - * - * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) +/* + * Evolution calendar - caldav backend * * This program is free software; you can redistribute it and/or - * modify it under the terms of version 2 of the GNU General Public - * License as published by the Free Software Foundation. + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) version 3. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with the program; if not, see * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * Author: Christian Kellner + * Authors: + * Christian Kellner + * + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) + * */ #include diff -Nru evolution-data-server-2.24.1/calendar/backends/caldav/e-cal-backend-caldav-factory.c evolution-data-server-2.24.1.1/calendar/backends/caldav/e-cal-backend-caldav-factory.c --- evolution-data-server-2.24.1/calendar/backends/caldav/e-cal-backend-caldav-factory.c 2008-10-13 10:08:29.000000000 +0200 +++ evolution-data-server-2.24.1.1/calendar/backends/caldav/e-cal-backend-caldav-factory.c 2008-11-07 05:34:24.000000000 +0100 @@ -1,21 +1,25 @@ -/* Evolution calendar - caldav backend factory - * - * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) +/* + * Evolution calendar - caldav backend factory * * This program is free software; you can redistribute it and/or - * modify it under the terms of version 2 of the GNU General Public - * License as published by the Free Software Foundation. + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) version 3. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with the program; if not, see * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * Author: Christian Kellner + * Authors: + * Christian Kellner + * + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) + * */ #ifdef HAVE_CONFIG_H diff -Nru evolution-data-server-2.24.1/calendar/backends/caldav/e-cal-backend-caldav-factory.h evolution-data-server-2.24.1.1/calendar/backends/caldav/e-cal-backend-caldav-factory.h --- evolution-data-server-2.24.1/calendar/backends/caldav/e-cal-backend-caldav-factory.h 2008-10-13 10:08:29.000000000 +0200 +++ evolution-data-server-2.24.1.1/calendar/backends/caldav/e-cal-backend-caldav-factory.h 2008-11-07 05:34:24.000000000 +0100 @@ -1,21 +1,25 @@ -/* Evolution calendar - caldav backend factory - * - * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) +/* + * Evolution calendar - caldav backend factory * * This program is free software; you can redistribute it and/or - * modify it under the terms of version 2 of the GNU General Public - * License as published by the Free Software Foundation. + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) version 3. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with the program; if not, see * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * Author: Christian Kellner + * Authors: + * Christian Kellner + * + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) + * */ #ifndef E_CAL_BACKEND_CALDAV_FACTORY_H diff -Nru evolution-data-server-2.24.1/calendar/backends/caldav/e-cal-backend-caldav.h evolution-data-server-2.24.1.1/calendar/backends/caldav/e-cal-backend-caldav.h --- evolution-data-server-2.24.1/calendar/backends/caldav/e-cal-backend-caldav.h 2008-10-13 10:08:29.000000000 +0200 +++ evolution-data-server-2.24.1.1/calendar/backends/caldav/e-cal-backend-caldav.h 2008-11-07 05:34:24.000000000 +0100 @@ -1,21 +1,23 @@ -/* Evolution calendar - caldav backend - * - * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) - * +/* * This program is free software; you can redistribute it and/or - * modify it under the terms of version 2 of the GNU General Public - * License as published by the Free Software Foundation. + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) version 3. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with the program; if not, see * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * Author: Christian Kellner + * Authors: + * Christian Kellner + * + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) + * */ #ifndef E_CAL_BACKEND_CALDAV_H diff -Nru evolution-data-server-2.24.1/calendar/ChangeLog evolution-data-server-2.24.1.1/calendar/ChangeLog --- evolution-data-server-2.24.1/calendar/ChangeLog 2008-10-16 06:40:31.000000000 +0200 +++ evolution-data-server-2.24.1.1/calendar/ChangeLog 2008-11-07 05:34:24.000000000 +0100 @@ -1,3 +1,17 @@ +2008-11-06 Sankar P + +License Changes + + * backends/caldav/e-cal-backend-caldav.h: + +2008-11-03 Sankar P + +License Changes + + * backends/caldav/e-cal-backend-caldav-factory.c: + * backends/caldav/e-cal-backend-caldav-factory.h: + * backends/caldav/e-cal-backend-caldav.c: + 2008-10-15 Suman Manjunath * backends/google/e-cal-backend-google.c diff -Nru evolution-data-server-2.24.1/camel/camel-db.c evolution-data-server-2.24.1.1/camel/camel-db.c --- evolution-data-server-2.24.1/camel/camel-db.c 2008-10-16 11:20:24.000000000 +0200 +++ evolution-data-server-2.24.1.1/camel/camel-db.c 2008-11-07 04:28:19.000000000 +0100 @@ -737,6 +737,27 @@ ret = camel_db_add_to_transaction (cdb, table_creation_query, ex); g_free (safe_index); sqlite3_free (table_creation_query); + + /* Index on deleted*/ + safe_index = g_strdup_printf("DELINDEX-%s", folder_name); + table_creation_query = sqlite3_mprintf ("CREATE INDEX IF NOT EXISTS %Q ON %Q (deleted)", safe_index, folder_name); + ret = camel_db_add_to_transaction (cdb, table_creation_query, ex); + g_free (safe_index); + sqlite3_free (table_creation_query); + + /* Index on Junk*/ + safe_index = g_strdup_printf("JUNKINDEX-%s", folder_name); + table_creation_query = sqlite3_mprintf ("CREATE INDEX IF NOT EXISTS %Q ON %Q (junk)", safe_index, folder_name); + ret = camel_db_add_to_transaction (cdb, table_creation_query, ex); + g_free (safe_index); + sqlite3_free (table_creation_query); + + /* Index on unread*/ + safe_index = g_strdup_printf("READINDEX-%s", folder_name); + table_creation_query = sqlite3_mprintf ("CREATE INDEX IF NOT EXISTS %Q ON %Q (read)", safe_index, folder_name); + ret = camel_db_add_to_transaction (cdb, table_creation_query, ex); + g_free (safe_index); + sqlite3_free (table_creation_query); return ret; } diff -Nru evolution-data-server-2.24.1/camel/camel-folder-summary.c evolution-data-server-2.24.1.1/camel/camel-folder-summary.c --- evolution-data-server-2.24.1/camel/camel-folder-summary.c 2008-10-16 10:34:01.000000000 +0200 +++ evolution-data-server-2.24.1.1/camel/camel-folder-summary.c 2008-11-07 05:34:23.000000000 +0100 @@ -827,12 +827,12 @@ if (time(NULL) - s->cache_load_time < SUMMARY_CACHE_DROP) return; - printf("removing cache for %s %d %p\n", s->folder ? s->folder->full_name : s->summary_path, g_hash_table_size (s->loaded_infos), s->loaded_infos); + d(printf("removing cache for %s %d %p\n", s->folder ? s->folder->full_name : s->summary_path, g_hash_table_size (s->loaded_infos), s->loaded_infos)); #warning "hack. fix it" CAMEL_SUMMARY_LOCK (s, summary_lock); g_hash_table_foreach_remove (s->loaded_infos, (GHRFunc) remove_item, s); CAMEL_SUMMARY_UNLOCK (s, summary_lock); - printf("done .. now %d\n",g_hash_table_size (s->loaded_infos)); + d(printf("done .. now %d\n",g_hash_table_size (s->loaded_infos))); s->cache_load_time = time(NULL); @@ -1378,7 +1378,7 @@ if (!count) return camel_folder_summary_header_save_to_db (s, ex); - printf("Saving %d/%d dirty records of %s\n", count, g_hash_table_size (s->loaded_infos), s->folder->full_name); + d(printf("Saving %d/%d dirty records of %s\n", count, g_hash_table_size (s->loaded_infos), s->folder->full_name)); camel_db_begin_transaction (cdb, ex); @@ -2120,6 +2120,7 @@ g_ptr_array_foreach (s->uids, (GFunc) camel_pstring_free, NULL); g_ptr_array_free (s->uids, TRUE); s->uids = g_ptr_array_new (); + s->visible_count = s->deleted_count = s->unread_count = 0; g_hash_table_destroy(s->loaded_infos); s->loaded_infos = g_hash_table_new(g_str_hash, g_str_equal); diff -Nru evolution-data-server-2.24.1/camel/camel-store.c evolution-data-server-2.24.1.1/camel/camel-store.c --- evolution-data-server-2.24.1/camel/camel-store.c 2008-10-16 11:20:24.000000000 +0200 +++ evolution-data-server-2.24.1.1/camel/camel-store.c 2008-11-07 05:34:23.000000000 +0100 @@ -700,6 +700,17 @@ return camel_store_get_folder(store, CAMEL_VJUNK_NAME, 0, ex); } +/** + * ignore_no_such_table_exception: + * Clears the exception 'ex' when it's the 'no such table' exception. + **/ +static void +ignore_no_such_table_exception (CamelException *ex) +{ + if (ex && camel_exception_is_set (ex) && g_ascii_strncasecmp (camel_exception_get_description (ex), "no such table", 13) == 0) + camel_exception_clear (ex); +} + static void store_sync (CamelStore *store, int expunge, CamelException *ex) { @@ -716,9 +727,10 @@ for (i=0;ilen;i++) { folder = folders->pdata[i]; if (!CAMEL_IS_VEE_FOLDER(folder) - && !camel_exception_is_set(&x)) + && !camel_exception_is_set(&x)) { camel_folder_sync(folder, expunge, &x); - else if (CAMEL_IS_VEE_FOLDER(folder)) + ignore_no_such_table_exception (&x); + } else if (CAMEL_IS_VEE_FOLDER(folder)) camel_vee_folder_sync_headers(folder, NULL); /* Literally don't care of vfolder exceptions */ camel_object_unref(folder); } diff -Nru evolution-data-server-2.24.1/camel/camel-vee-summary.c evolution-data-server-2.24.1.1/camel/camel-vee-summary.c --- evolution-data-server-2.24.1/camel/camel-vee-summary.c 2008-10-16 11:20:24.000000000 +0200 +++ evolution-data-server-2.24.1.1/camel/camel-vee-summary.c 2008-11-07 04:37:10.000000000 +0100 @@ -42,7 +42,7 @@ #define d(x) static CamelFolderSummaryClass *camel_vee_summary_parent; -const char *unread_str = " (and\n \n (match-all (not (system-flag \"Seen\")))\n \n )\n"; +const char *unread_str = " (and\n \n (match-all (not (system-flag \"Seen\")))\n \n )\n; (match-threads \"all\" (and\n \n (match-all (not (system-flag \"Seen\")))\n \n )\n)\n;"; static void vee_message_info_free(CamelFolderSummary *s, CamelMessageInfo *info) diff -Nru evolution-data-server-2.24.1/camel/camel-vtrash-folder.c evolution-data-server-2.24.1.1/camel/camel-vtrash-folder.c --- evolution-data-server-2.24.1/camel/camel-vtrash-folder.c 2008-10-16 06:37:29.000000000 +0200 +++ evolution-data-server-2.24.1.1/camel/camel-vtrash-folder.c 2008-11-07 05:34:23.000000000 +0100 @@ -208,7 +208,7 @@ const CamelMessageInfo *info, char **appended_uid, CamelException *ex) { - camel_exception_setv(ex, CAMEL_EXCEPTION_SYSTEM, + camel_exception_setv(ex, CAMEL_EXCEPTION_SYSTEM, "%s", _(vdata[((CamelVTrashFolder *)folder)->type].error_copy)); } @@ -257,7 +257,7 @@ if (CAMEL_IS_VTRASH_FOLDER (dest)) { /* Copy to trash is meaningless. */ if (!delete_originals) { - camel_exception_setv(ex, CAMEL_EXCEPTION_SYSTEM, + camel_exception_setv(ex, CAMEL_EXCEPTION_SYSTEM, "%s", _(vdata[((CamelVTrashFolder *)dest)->type].error_copy)); return; } diff -Nru evolution-data-server-2.24.1/camel/ChangeLog evolution-data-server-2.24.1.1/camel/ChangeLog --- evolution-data-server-2.24.1/camel/ChangeLog 2008-10-16 11:20:24.000000000 +0200 +++ evolution-data-server-2.24.1.1/camel/ChangeLog 2008-11-07 04:38:26.000000000 +0100 @@ -1,3 +1,41 @@ +2008-11-07 Srinivasa Ragavan + + * camel-vee-summary.c: Make unread vfolders to work for match threads. + +2008-11-07 Srinivasa Ragavan + + ** Fix for bug #558883 + + * camel-db.c: (camel_db_prepare_message_info_table): Index more + fields. + +2008-11-06 Milan Crha + + ** Fix for bug #555979 + + * camel-store.c: (ignore_no_such_table_exception): New helper function. + * camel-store.c: (store_sync): Ignore 'no such table' exceptions. + +2008-10-31 Matthew Barnes + + ** Fixes part of bug #558727 (patch by Frederic van Starbmann) + + * camel-vtrash-folder.c (vtrash_append_message), + (vtrash_transfer_messages_to): + Fix some potential string format crashes. + +2008-10-31 Sankar P + + ** Fix for bnc bugs #440502, #209514, #434958, #434946, + #435725, #434950, #372382, #435727 + + * camel-folder-summary.c (camel_folder_summary_clear_db): + GroupWise improvements + +2008-10-23 Matthew Barnes + + * camel-folder-summary.c: Remove more console spew. + 2008-10-16 Srinivasa Ragavan * camel/camel-db.c: Remove console spew. diff -Nru evolution-data-server-2.24.1/camel/providers/groupwise/camel-groupwise-folder.c evolution-data-server-2.24.1.1/camel/providers/groupwise/camel-groupwise-folder.c --- evolution-data-server-2.24.1/camel/providers/groupwise/camel-groupwise-folder.c 2008-10-20 05:28:10.000000000 +0200 +++ evolution-data-server-2.24.1.1/camel/providers/groupwise/camel-groupwise-folder.c 2008-11-07 05:34:23.000000000 +0100 @@ -93,6 +93,9 @@ #define d(x) +const char * GET_ITEM_VIEW_WITH_CACHE = "peek default recipient threading attachments subject status priority startDate created delivered size recurrenceKey message notification"; +const char * GET_ITEM_VIEW_WITHOUT_CACHE = "peek default recipient threading hasAttachment subject status priority startDate created delivered size recurrenceKey"; + static CamelMimeMessage * groupwise_folder_get_message( CamelFolder *folder, const char *uid, CamelException *ex ) { @@ -166,7 +169,7 @@ cnc = cnc_lookup (priv); - status = e_gw_connection_get_item (cnc, container_id, uid, "peek default distribution recipient message attachments subject notification created recipientStatus status hasAttachment size recurrenceKey", &item); + status = e_gw_connection_get_item (cnc, container_id, uid, GET_ITEM_VIEW_WITH_CACHE, &item); if (status != E_GW_CONNECTION_STATUS_OK) { g_free (container_id); camel_exception_set (ex, CAMEL_EXCEPTION_SERVICE_INVALID, _("Could not get message")); @@ -183,8 +186,11 @@ return NULL; } - if (msg) + if (msg) { camel_medium_set_header (CAMEL_MEDIUM (msg), "X-Evolution-Source", groupwise_base_url_lookup (priv)); + mi->info.dirty = TRUE; + camel_folder_summary_touch (folder->summary); + } /* add to cache */ CAMEL_GROUPWISE_FOLDER_REC_LOCK (folder, cache_lock); @@ -643,6 +649,9 @@ } CAMEL_SERVICE_REC_UNLOCK (gw_store, connect_lock); + if (folder->folder_flags & CAMEL_FOLDER_HAS_BEEN_DELETED) + return ; + count = camel_folder_summary_count (folder->summary); CAMEL_GROUPWISE_FOLDER_REC_LOCK (folder, cache_lock); for (i=0 ; i < count ; i++) { @@ -1186,6 +1195,18 @@ if (list) { gw_update_cache (folder, list, ex, FALSE); } + + if (check_all && !is_proxy) { + EGwContainer *container; + container = e_gw_connection_get_container (cnc, container_id); + + d(printf ("Evolution's folder summary length is : %u\tserver has %u items", + camel_folder_summary_count (folder->summary), e_gw_container_get_total_count (container))); + + if (camel_folder_summary_count (folder->summary) == e_gw_container_get_total_count (container)) + check_all = FALSE; + g_object_unref (container); + } } @@ -1247,6 +1268,10 @@ gboolean is_proxy = folder->parent_store->flags & CAMEL_STORE_WRITE; + int folder_needs_caching; + + camel_object_get (folder, NULL, CAMEL_OFFLINE_FOLDER_ARG_SYNC_OFFLINE, &folder_needs_caching, NULL); + changes = camel_folder_change_info_new (); container_id = g_strdup (camel_groupwise_store_container_id_lookup (gw_store, folder->full_name)); if (!container_id) { @@ -1285,7 +1310,11 @@ camel_operation_progress (NULL, (100*i)/total_items); - status = e_gw_connection_get_item (cnc, container_id, id, "peek default distribution recipient message attachments subject notification created recipientStatus status hasAttachment size recurrenceKey", &item); + if (folder_needs_caching) + status = e_gw_connection_get_item (cnc, container_id, id, GET_ITEM_VIEW_WITH_CACHE, &item); + else + status = e_gw_connection_get_item (cnc, container_id, id, GET_ITEM_VIEW_WITHOUT_CACHE, &item); + if (status != E_GW_CONNECTION_STATUS_OK) { i++; continue; @@ -1351,33 +1380,33 @@ mi->server_flags = mi->info.flags; org = e_gw_item_get_organizer (item); + if (org) { - GString *str; - int i; - str = g_string_new (""); - if (org->display_name && org->display_name[0] && org->email != NULL && org->email[0] != '\0') { - for (i = 0; org->display_name[i] != '<' && - org->display_name[i] != '\0'; - i++); + GString *str; + int i; + str = g_string_new (""); - org->display_name[i] = '\0'; - str = g_string_append (str, org->display_name); - str = g_string_append (str, " "); - } + if (org->display_name && org->display_name[0] && org->email != NULL && org->email[0] != '\0') { + for (i = 0; org->display_name[i] != '<' && + org->display_name[i] != '\0'; + i++); + + org->display_name[i] = '\0'; + str = g_string_append (str, org->display_name); + str = g_string_append (str, " "); + } - if (org->display_name[0] == '\0') { + if (org->email && org->email[0]) { + g_string_append (str, "<"); + str = g_string_append (str, org->email); + g_string_append (str, ">"); + } - str = g_string_append (str, org->email); - str = g_string_append (str, " "); - } - if (org->email && org->email[0]) { - g_string_append (str, "<"); - str = g_string_append (str, org->email); - g_string_append (str, ">"); - } - mi->info.from = camel_pstring_strdup (str->str); - g_string_free (str, TRUE); + + mi->info.from = camel_pstring_strdup (str->str); + g_string_free (str, TRUE); } + g_string_truncate (str, 0); recp_list = e_gw_item_get_recipient_list (item); if (recp_list) { @@ -1423,16 +1452,19 @@ } } - if (!exists) { - mi->info.uid = camel_pstring_strdup (e_gw_item_get_id(item)); - mi->info.size = e_gw_item_get_mail_size (item); - mi->info.subject = camel_pstring_strdup(e_gw_item_get_subject(item)); - } - if (exists) { camel_folder_change_info_change_uid (changes, mi->info.uid); camel_message_info_free (pmi); } else { + mi->info.uid = camel_pstring_strdup (e_gw_item_get_id(item)); + mi->info.size = e_gw_item_get_mail_size (item); + mi->info.subject = camel_pstring_strdup(e_gw_item_get_subject(item)); + mi->info.dirty = TRUE; + + folder->summary->visible_count ++; + if (!(mi->info.flags & CAMEL_MESSAGE_SEEN)) + folder->summary->unread_count ++; + camel_folder_summary_add (folder->summary,(CamelMessageInfo *)mi); camel_folder_change_info_add_uid (changes, mi->info.uid); camel_folder_change_info_recent_uid (changes, mi->info.uid); @@ -1442,27 +1474,30 @@ if (!strcmp (folder->full_name, "Junk Mail")) continue; - /******************** Begine Caching ************************/ - /* add to cache if its a new message*/ - t_cache_stream = camel_data_cache_get (gw_folder->cache, "cache", id, ex); - if (t_cache_stream) { - camel_object_unref (t_cache_stream); - - mail_msg = groupwise_folder_item_to_msg (folder, item, ex); - if (mail_msg) - camel_medium_set_header (CAMEL_MEDIUM (mail_msg), "X-Evolution-Source", groupwise_base_url_lookup (priv)); + if (folder_needs_caching) { + /******************** Begine Caching ************************/ + /* add to cache if its a new message*/ + t_cache_stream = camel_data_cache_get (gw_folder->cache, "cache", id, ex); + if (t_cache_stream) { + camel_object_unref (t_cache_stream); + + mail_msg = groupwise_folder_item_to_msg (folder, item, ex); + if (mail_msg) + camel_medium_set_header (CAMEL_MEDIUM (mail_msg), "X-Evolution-Source", groupwise_base_url_lookup (priv)); - CAMEL_GROUPWISE_FOLDER_REC_LOCK (folder, cache_lock); - if ((cache_stream = camel_data_cache_add (gw_folder->cache, "cache", id, NULL))) { - if (camel_data_wrapper_write_to_stream ((CamelDataWrapper *) mail_msg, cache_stream) == -1 || camel_stream_flush (cache_stream) == -1) - camel_data_cache_remove (gw_folder->cache, "cache", id, NULL); - camel_object_unref (cache_stream); - } + CAMEL_GROUPWISE_FOLDER_REC_LOCK (folder, cache_lock); + if ((cache_stream = camel_data_cache_add (gw_folder->cache, "cache", id, NULL))) { + if (camel_data_wrapper_write_to_stream ((CamelDataWrapper *) mail_msg, cache_stream) == -1 || camel_stream_flush (cache_stream) == -1) + camel_data_cache_remove (gw_folder->cache, "cache", id, NULL); + camel_object_unref (cache_stream); + } - camel_object_unref (mail_msg); - CAMEL_GROUPWISE_FOLDER_REC_UNLOCK (folder, cache_lock); + camel_object_unref (mail_msg); + CAMEL_GROUPWISE_FOLDER_REC_UNLOCK (folder, cache_lock); + } + /******************** Caching stuff ends *************************/ } - /******************** Caching stuff ends *************************/ + i++; g_object_unref (item); } @@ -2130,6 +2165,12 @@ EGwConnectionStatus status = E_GW_CONNECTION_STATUS_OK; EGwConnection *cnc; CamelFolderChangeInfo *changes = NULL; + gboolean destination_is_trash; + + if (destination == camel_store_get_trash (source->parent_store, NULL)) + destination_is_trash = TRUE; + else + destination_is_trash = FALSE; count = camel_folder_summary_count (destination->summary); qsort (uids->pdata, uids->len, sizeof (void *), uid_compar); @@ -2157,6 +2198,9 @@ GList *l; int i; + if (destination_is_trash) + delete_originals = TRUE; + for (l = item_ids, i = 0; l; l = l->next, i++) { CamelMessageInfo *info; @@ -2247,33 +2291,40 @@ } } - if (delete_originals) { - if (strcmp(source->full_name, "Sent Items")) { - status = e_gw_connection_move_item (cnc, (const char *)uids->pdata[index], - dest_container_id, source_container_id); - } else { - char *container_id = NULL; - container_id = e_gw_connection_get_container_id (cnc, "Mailbox"); - status = e_gw_connection_move_item (cnc, (const char *)uids->pdata[index], - dest_container_id, container_id); - g_free (container_id); - } + if (destination_is_trash) { + e_gw_connection_remove_item (cnc, source_container_id, (const char*) uids->pdata[index]); + camel_folder_summary_remove_uid (source->summary, uids->pdata[index]); + camel_folder_change_info_remove_uid (changes, uids->pdata[index]); + } else { + if (delete_originals) { + if (strcmp(source->full_name, "Sent Items")) { + status = e_gw_connection_move_item (cnc, (const char *)uids->pdata[index], + dest_container_id, source_container_id); + } else { + char *container_id = NULL; + container_id = e_gw_connection_get_container_id (cnc, "Mailbox"); + status = e_gw_connection_move_item (cnc, (const char *)uids->pdata[index], + dest_container_id, container_id); + g_free (container_id); + } - } else - status = e_gw_connection_move_item (cnc, (const char *)uids->pdata[index], - dest_container_id, NULL); + } else + status = e_gw_connection_move_item (cnc, (const char *)uids->pdata[index], + dest_container_id, NULL); + + if (status == E_GW_CONNECTION_STATUS_OK) { + if (delete_originals) { + /*if ( !strcmp(source->full_name, SENT) ) { + camel_folder_delete_message(source, uids->pdata[index]); + } else {*/ + camel_folder_summary_remove_uid (source->summary, uids->pdata[index]); + camel_folder_change_info_remove_uid (changes, uids->pdata[index]); + //} + } + } else { + g_warning ("Warning!! Could not move item : %s\n", (char *)uids->pdata[index]); + } - if (status == E_GW_CONNECTION_STATUS_OK) { - if (delete_originals) { - /*if ( !strcmp(source->full_name, SENT) ) { - camel_folder_delete_message(source, uids->pdata[index]); - } else {*/ - camel_folder_summary_remove_uid (source->summary, uids->pdata[index]); - camel_folder_change_info_remove_uid (changes, uids->pdata[index]); - //} - } - } else { - g_warning ("Warning!! Could not move item : %s\n", (char *)uids->pdata[index]); } index ++; } diff -Nru evolution-data-server-2.24.1/camel/providers/groupwise/camel-groupwise-store.c evolution-data-server-2.24.1.1/camel/providers/groupwise/camel-groupwise-store.c --- evolution-data-server-2.24.1/camel/providers/groupwise/camel-groupwise-store.c 2008-10-13 10:07:24.000000000 +0200 +++ evolution-data-server-2.24.1.1/camel/providers/groupwise/camel-groupwise-store.c 2008-11-07 05:34:23.000000000 +0100 @@ -56,6 +56,7 @@ #define JUNK_ENABLE 1 #define JUNK_PERSISTENCE 14 +const char * CREATE_CURSOR_VIEW = "peek id default recipient threading hasAttachment subject status priority startDate created delivered size recurrenceKey"; struct _CamelGroupwiseStorePrivate { char *server_name; @@ -469,13 +470,11 @@ static void groupwise_forget_folder (CamelGroupwiseStore *gw_store, const char *folder_name, CamelException *ex) { - CamelFolderSummary *summary; CamelGroupwiseStorePrivate *priv = gw_store->priv; - char *summary_file, *state_file; + char *state_file; char *folder_dir, *storage_path; CamelFolderInfo *fi; const char *name; - name = folder_name; @@ -487,19 +486,6 @@ return; } - summary_file = g_strdup_printf ("%s/summary", folder_dir); - summary = camel_groupwise_summary_new(NULL,summary_file); - if(!summary) { - g_free(summary_file); - g_free(folder_dir); - return; - } - - camel_object_unref (summary); - g_unlink (summary_file); - g_free (summary_file); - - state_file = g_strdup_printf ("%s/cmeta", folder_dir); g_unlink (state_file); g_free (state_file); @@ -611,7 +597,7 @@ d(g_print ("\n\n** %s **: No summary as yet : using get cursor request\n\n", folder->name);) status = e_gw_connection_create_cursor (priv->cnc, container_id, - "peek id recipient attachments distribution subject status options priority startDate created delivered size hasAttachment", + CREATE_CURSOR_VIEW, NULL, &cursor); if (status != E_GW_CONNECTION_STATUS_OK) { @@ -624,37 +610,50 @@ camel_folder_summary_clear (folder->summary); while (!done) { - status = e_gw_connection_read_cursor (priv->cnc, container_id, - cursor, FALSE, - CURSOR_ITEM_LIMIT, position, &list); - if (status != E_GW_CONNECTION_STATUS_OK) { - all_ok = FALSE; - break; - /* - CAMEL_SERVICE_REC_UNLOCK (gw_store, connect_lock); - e_gw_connection_destroy_cursor (priv->cnc, container_id, cursor); - //camel_folder_summary_clear (folder->summary); - camel_folder_summary_save_to_db (folder->summary, ex); - camel_exception_set (ex, CAMEL_EXCEPTION_SERVICE_INVALID, _("Authentication failed")); - camel_operation_end (NULL); - camel_object_unref (folder); - g_free (container_id); - return NULL;*/ - } - - count += g_list_length (list); - - if (total > 0) - camel_operation_progress (NULL, (100*count)/total); - gw_update_summary (folder, list, ex); - - if (!list) - done = TRUE; - g_list_foreach (list, (GFunc)g_object_unref, NULL); - g_list_free (list); - list = NULL; - position = E_GW_CURSOR_POSITION_CURRENT; - } + status = e_gw_connection_read_cursor (priv->cnc, container_id, + cursor, FALSE, + CURSOR_ITEM_LIMIT, position, &list); + if (status != E_GW_CONNECTION_STATUS_OK) { + all_ok = FALSE; + break; + /* + CAMEL_SERVICE_REC_UNLOCK (gw_store, connect_lock); + e_gw_connection_destroy_cursor (priv->cnc, container_id, cursor); + //camel_folder_summary_clear (folder->summary); + camel_folder_summary_save_to_db (folder->summary, ex); + camel_exception_set (ex, CAMEL_EXCEPTION_SERVICE_INVALID, _("Authentication failed")); + camel_operation_end (NULL); + camel_object_unref (folder); + g_free (container_id); + return NULL;*/ + } + + /* This full block is repeated in the reload_folder code as well. We need + better modularity */ + count += CURSOR_ITEM_LIMIT; + + if (total > 0) { + d(printf ("Doing readcursor : [total: %d] [count: %d]\n", total, count)); + + if (count > total) + count = total; + + camel_operation_progress (NULL, (100*count)/total); + } + + gw_update_summary (folder, list, ex); + + /* For shared-folders created by the user, we don't get the total number of messages, + in the getFolderList call. So, we need to wait until an empty list is returned in the + read cursor call. Hence, we need the !list checking in the code below */ + if (count == total || !list) + done = TRUE; + + g_list_foreach (list, (GFunc)g_object_unref, NULL); + g_list_free (list); + list = NULL; + position = E_GW_CURSOR_POSITION_CURRENT; + } e_gw_connection_destroy_cursor (priv->cnc, container_id, cursor); @@ -721,51 +720,63 @@ summary_count = camel_folder_summary_count (folder->summary); if(!summary_count || !summary->time_string) { - d(g_print ("\n\n** %s **: Summary missing???? Reloading summary....\n\n", folder->name);) + d(g_print ("\n\n** %s **: Summary missing???? Reloading summary....\n\n", folder->name);) - status = e_gw_connection_create_cursor (priv->cnc, container_id, - "peek id recipient attachments distribution subject status options priority startDate created delivered size hasAttachment", - NULL, - &cursor); - if (status != E_GW_CONNECTION_STATUS_OK) { - CAMEL_SERVICE_REC_UNLOCK (gw_store, connect_lock); - g_free (container_id); - return; - } + status = e_gw_connection_create_cursor (priv->cnc, container_id, + CREATE_CURSOR_VIEW, + NULL, + &cursor); + if (status != E_GW_CONNECTION_STATUS_OK) { + CAMEL_SERVICE_REC_UNLOCK (gw_store, connect_lock); + g_free (container_id); + return; + } - camel_operation_start (NULL, _("Fetching summary information for new messages in %s"), folder->name); + camel_operation_start (NULL, _("Fetching summary information for new messages in %s"), folder->name); - while (!done) { - status = e_gw_connection_read_cursor (priv->cnc, container_id, - cursor, FALSE, - CURSOR_ITEM_LIMIT, position, &list); - if (status != E_GW_CONNECTION_STATUS_OK) { - CAMEL_SERVICE_REC_UNLOCK (gw_store, connect_lock); - e_gw_connection_destroy_cursor (priv->cnc, container_id, cursor); - camel_folder_summary_save_to_db (folder->summary, ex); - camel_exception_set (ex, CAMEL_EXCEPTION_SERVICE_INVALID, _("Authentication failed")); - camel_operation_end (NULL); - g_free (container_id); - return; + while (!done) { + status = e_gw_connection_read_cursor (priv->cnc, container_id, + cursor, FALSE, + CURSOR_ITEM_LIMIT, position, &list); + if (status != E_GW_CONNECTION_STATUS_OK) { + CAMEL_SERVICE_REC_UNLOCK (gw_store, connect_lock); + e_gw_connection_destroy_cursor (priv->cnc, container_id, cursor); + camel_folder_summary_save_to_db (folder->summary, ex); + camel_exception_set (ex, CAMEL_EXCEPTION_SERVICE_INVALID, _("Authentication failed")); + camel_operation_end (NULL); + g_free (container_id); + return; + } + /* This full block is repeated in the get_folder code as well. We need + better modularity */ + count += CURSOR_ITEM_LIMIT; + + if (total > 0) { + d(printf ("Doing readcursor : [total: %d] [count: %d]\n", total, count)); + + if (count > total) + count = total; + + camel_operation_progress (NULL, (100*count)/total); + } + + gw_update_summary (folder, list, ex); + + /* For shared-folders created by the user, we don't get the total number of messages, + in the getFolderList call. So, we need to wait until an empty list is returned in the + read cursor call. Hence, we need the !list checking in the code below */ + if (count == total || !list) + done = TRUE; + + g_list_foreach (list, (GFunc)g_object_unref, NULL); + g_list_free (list); + list = NULL; + position = E_GW_CURSOR_POSITION_CURRENT; } - - count += g_list_length (list); - - if (total > 0) - camel_operation_progress (NULL, (100*count)/total); - gw_update_summary (folder, list, ex); - - if (!list) - done = TRUE; - g_list_foreach (list, (GFunc)g_object_unref, NULL); - g_list_free (list); - list = NULL; - position = E_GW_CURSOR_POSITION_CURRENT; - } - e_gw_connection_destroy_cursor (priv->cnc, container_id, cursor); + e_gw_connection_destroy_cursor (priv->cnc, container_id, cursor); - camel_operation_end (NULL); + camel_operation_end (NULL); } if (done) { @@ -867,6 +878,9 @@ if (e_gw_container_get_is_shared_by_me (container)) fi->flags |= CAMEL_FOLDER_SHARED_BY_ME; + if (e_gw_container_get_is_system_folder (container)) + fi->flags |= CAMEL_FOLDER_SYSTEM; + fi->total = e_gw_container_get_total_count (container); fi->unread = e_gw_container_get_unread_count (container); diff -Nru evolution-data-server-2.24.1/camel/providers/groupwise/camel-groupwise-summary.c evolution-data-server-2.24.1.1/camel/providers/groupwise/camel-groupwise-summary.c --- evolution-data-server-2.24.1/camel/providers/groupwise/camel-groupwise-summary.c 2008-10-14 07:30:40.000000000 +0200 +++ evolution-data-server-2.24.1.1/camel/providers/groupwise/camel-groupwise-summary.c 2008-11-07 05:34:23.000000000 +0100 @@ -171,7 +171,7 @@ camel_exception_init (&ex); if (camel_folder_summary_load_from_db (summary, &ex) == -1) { - camel_folder_summary_clear (summary); + camel_folder_summary_clear_db (summary); } return summary; @@ -394,6 +394,7 @@ mi->summary->unread_count -- ; } + mi->dirty = TRUE; camel_folder_summary_touch(mi->summary); } } @@ -489,7 +490,7 @@ camel_message_info_free(info); } - camel_folder_summary_clear (summary); + camel_folder_summary_clear_db (summary); //camel_folder_summary_save (summary); if (uncache) diff -Nru evolution-data-server-2.24.1/camel/providers/groupwise/ChangeLog evolution-data-server-2.24.1.1/camel/providers/groupwise/ChangeLog --- evolution-data-server-2.24.1/camel/providers/groupwise/ChangeLog 2008-10-20 05:28:10.000000000 +0200 +++ evolution-data-server-2.24.1.1/camel/providers/groupwise/ChangeLog 2008-11-07 05:34:23.000000000 +0100 @@ -1,3 +1,18 @@ +2008-10-31 Sankar P + + ** Fix for bnc bugs #440502, #209514, #434958, #434946, + #435725, #434950, #372382, #435727 + + * camel-groupwise-folder.c (groupwise_folder_get_message), + (groupwise_sync), (groupwise_refresh_folder), (gw_update_cache), + (groupwise_transfer_messages_to): + * camel-groupwise-store.c (groupwise_forget_folder), + (groupwise_get_folder), (gw_store_reload_folder), + (convert_to_folder_info): + * camel-groupwise-summary.c (camel_groupwise_summary_new), + (gw_info_set_flags), (groupwise_summary_clear): + GroupWise Improvements + 2008-10-17 Milan Crha ** Part of fix for bug #547243 diff -Nru evolution-data-server-2.24.1/camel/providers/imap/camel-imap-folder.c evolution-data-server-2.24.1.1/camel/providers/imap/camel-imap-folder.c --- evolution-data-server-2.24.1/camel/providers/imap/camel-imap-folder.c 2008-10-20 05:28:10.000000000 +0200 +++ evolution-data-server-2.24.1.1/camel/providers/imap/camel-imap-folder.c 2008-11-07 04:30:18.000000000 +0100 @@ -1584,25 +1584,16 @@ { CamelImapStore *store = CAMEL_IMAP_STORE (folder->parent_store); GPtrArray *uids; - int i, count; - CamelMessageInfo *info; - uids = g_ptr_array_new (); - count = camel_folder_summary_count (folder->summary); - for (i = 0; i < count; i++) { - info = camel_folder_summary_index (folder->summary, i); - if (camel_message_info_flags(info) & CAMEL_MESSAGE_DELETED) - g_ptr_array_add (uids, g_strdup (camel_message_info_uid (info))); - camel_message_info_free(info); - } + camel_folder_summary_save_to_db (folder->summary, ex); + uids = camel_db_get_folder_deleted_uids (folder->parent_store->cdb_r, folder->full_name, ex); if (CAMEL_OFFLINE_STORE (store)->state == CAMEL_OFFLINE_STORE_NETWORK_AVAIL) imap_expunge_uids_online (folder, uids, ex); else imap_expunge_uids_offline (folder, uids, ex); - for (i = 0; i < uids->len; i++) - g_free (uids->pdata[i]); + g_ptr_array_foreach (uids, (GFunc) camel_pstring_free, NULL); g_ptr_array_free (uids, TRUE); } @@ -2158,7 +2149,7 @@ camel_exception_init (&ex); /* refresh folder's summary first, we copied messages there on the server, but do not know about it in a local summary */ - camel_folder_refresh_info (destination, &ex); + imap_refresh_info (destination, &ex); if (camel_exception_is_set (&ex)) { g_warning ("destination folder refresh failed, error: %s", ex.desc); camel_exception_clear (&ex); @@ -2304,7 +2295,7 @@ /* Make the destination notice its new messages */ if (store->current_folder != dest || camel_folder_summary_count (dest->summary) == count) - camel_folder_refresh_info (dest, ex); + imap_refresh_info (dest, ex); /* FIXME */ if (transferred_uids) diff -Nru evolution-data-server-2.24.1/camel/providers/imap/ChangeLog evolution-data-server-2.24.1.1/camel/providers/imap/ChangeLog --- evolution-data-server-2.24.1/camel/providers/imap/ChangeLog 2008-10-20 05:28:10.000000000 +0200 +++ evolution-data-server-2.24.1.1/camel/providers/imap/ChangeLog 2008-11-07 04:29:28.000000000 +0100 @@ -1,3 +1,19 @@ +2008-11-07 Srinivasa Ragavan + + ** Fix for bug #558883 + + * camel-imap-folder.c: (imap_expunge): Do in bulk + +2008-11-06 Milan Crha + + ** Fix for bug #558737 + + * camel-imap-folder.c: (handle_copyuid_copy_user_tags), + (imap_transfer_online): Do not use 'camel_folder_refresh_folder', use + 'imap_refresh_folder' instead, because the former locks the folder + lock too, which could make a deadlock when we are refreshing that + folder in other thread, which is waiting for the connect lock we hold. + 2008-10-17 Srinivasa Ragavan ** Fix for bug #556688 diff -Nru evolution-data-server-2.24.1/camel/providers/nntp/camel-nntp-summary.c evolution-data-server-2.24.1.1/camel/providers/nntp/camel-nntp-summary.c --- evolution-data-server-2.24.1/camel/providers/nntp/camel-nntp-summary.c 2008-10-14 07:30:40.000000000 +0200 +++ evolution-data-server-2.24.1.1/camel/providers/nntp/camel-nntp-summary.c 2008-11-04 03:50:07.000000000 +0100 @@ -155,9 +155,6 @@ if (cns->priv->uid == NULL) return NULL; - /* we shouldn't be here if we already have this uid */ - g_assert(camel_folder_summary_uid(s, cns->priv->uid) == NULL); - mi = (CamelMessageInfoBase *)((CamelFolderSummaryClass *)camel_nntp_summary_parent)->message_info_new_from_header(s, h); if (mi) { camel_pstring_free(mi->uid); @@ -326,16 +323,13 @@ /* truncated line? ignore? */ if (xover == NULL) { - mi = (CamelMessageInfoBase *)camel_folder_summary_uid(s, cns->priv->uid); - if (mi == NULL) { + if (!camel_folder_summary_check_uid (s, cns->priv->uid)) { mi = (CamelMessageInfoBase *)camel_folder_summary_add_from_header(s, headers); if (mi) { mi->size = size; cns->high = n; camel_folder_change_info_add_uid(changes, camel_message_info_uid(mi)); } - } else { - camel_message_info_free(mi); } } @@ -393,8 +387,7 @@ if ((msgid = strchr(line, '<')) && (line = strchr(msgid+1, '>'))){ line[1] = 0; cns->priv->uid = g_strdup_printf("%u,%s\n", n, msgid); - mi = camel_folder_summary_uid(s, cns->priv->uid); - if (mi == NULL) { + if (!camel_folder_summary_check_uid (s, cns->priv->uid)) { if (camel_mime_parser_init_with_stream(mp, (CamelStream *)store->stream) == -1) goto error; mi = camel_folder_summary_add_from_parser(s, mp); @@ -405,9 +398,6 @@ } cns->high = i; camel_folder_change_info_add_uid(changes, camel_message_info_uid(mi)); - } else { - /* already have, ignore */ - camel_message_info_free(mi); } if (cns->priv->uid) { g_free(cns->priv->uid); @@ -449,6 +439,7 @@ int count; char *folder = NULL; CamelNNTPStoreInfo *si; + GSList *del = NULL; s = (CamelFolderSummary *)cns; @@ -479,7 +470,7 @@ if (cns->low != f) { count = camel_folder_summary_count(s); for (i = 0; i < count; i++) { - const char *uid; + char *uid; const char *msgid; uid = camel_folder_summary_uid_from_index(s, i); @@ -494,10 +485,13 @@ if (msgid) camel_data_cache_remove(store->cache, "cache", msgid+1, NULL); camel_folder_change_info_remove_uid(changes, uid); - camel_folder_summary_remove_uid (s, uid); + del = g_slist_prepend (del, uid); + camel_folder_summary_remove_uid_fast (s, uid); + uid = NULL; /*Lets not free it */ count--; i--; } + g_free (uid); } cns->low = f; } @@ -513,25 +507,22 @@ } } + camel_db_delete_uids (s->folder->parent_store->cdb_w, s->folder->full_name, del, ex); + g_slist_foreach (del, (GFunc) g_free, NULL); + g_slist_free (del); + /* TODO: not from here */ camel_folder_summary_touch(s); camel_folder_summary_save_to_db (s, ex); + update: /* update store summary if we have it */ if (folder && (si = (CamelNNTPStoreInfo *)camel_store_summary_path((CamelStoreSummary *)store->summary, folder))) { - int unread = 0; - - count = camel_folder_summary_count(s); - for (i = 0; i < count; i++) { - CamelMessageInfoBase *mi = (CamelMessageInfoBase *)camel_folder_summary_index(s, i); + guint32 unread = 0; - if (mi) { - if ((mi->flags & CAMEL_MESSAGE_SEEN) == 0) - unread++; - camel_message_info_free(mi); - } - } + count = camel_folder_summary_count (s); + camel_db_count_unread_message_info (s->folder->parent_store->cdb_r, s->folder->full_name, &unread, ex); if (si->info.unread != unread || si->info.total != count diff -Nru evolution-data-server-2.24.1/camel/providers/nntp/ChangeLog evolution-data-server-2.24.1.1/camel/providers/nntp/ChangeLog --- evolution-data-server-2.24.1/camel/providers/nntp/ChangeLog 2008-10-14 07:38:32.000000000 +0200 +++ evolution-data-server-2.24.1.1/camel/providers/nntp/ChangeLog 2008-11-04 03:50:07.000000000 +0100 @@ -1,3 +1,10 @@ +2008-10-21 Srinivasa Ragavan + + ** Fix for bug #556119 + + * camel/providers/nntp/camel-nntp-summary.c: Do things in bulk + * camel/providers/nntp/camel-nntp-utils.c: + 2008-10-14 Srinivasa Ragavan ** Fix for bug #552261 diff -Nru evolution-data-server-2.24.1/ChangeLog evolution-data-server-2.24.1.1/ChangeLog --- evolution-data-server-2.24.1/ChangeLog 2008-10-20 10:05:58.000000000 +0200 +++ evolution-data-server-2.24.1.1/ChangeLog 2008-11-07 07:50:25.000000000 +0100 @@ -1,6 +1,25 @@ +2008-11-07 Srinivasa Ragavan + + * NEWS, configure.in: Evolution Data Server 2.24.1.1 release + +2008-11-03 Sankar P + +License Changes + + * libedataserver/e-proxy.c: + * libedataserver/e-proxy.h: + +2008-10-31 Matthew Barnes + + ** Fixes part of bug #558727 (patch by Frederic van Starbmann) + + * libebackend/e-data-server-module (e_data_server_module_load): + Fix some potential string format crashes. + 2008-10-20 Srinivasa Ragavan - * NEWS, configure.in: Evolution Data Server 2.24.1 release. + * NEWS, configure.in: Evolution Data Server 2.24.1 release and version + bump. 2008-10-01 Suman Manjunath diff -Nru evolution-data-server-2.24.1/configure evolution-data-server-2.24.1.1/configure --- evolution-data-server-2.24.1/configure 2008-10-20 05:32:45.000000000 +0200 +++ evolution-data-server-2.24.1.1/configure 2008-11-07 06:17:26.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.62 for evolution-data-server 2.24.1. +# Generated by GNU Autoconf 2.62 for evolution-data-server 2.24.1.1. # # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, # 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. @@ -748,8 +748,8 @@ # Identity of this package. PACKAGE_NAME='evolution-data-server' PACKAGE_TARNAME='evolution-data-server' -PACKAGE_VERSION='2.24.1' -PACKAGE_STRING='evolution-data-server 2.24.1' +PACKAGE_VERSION='2.24.1.1' +PACKAGE_STRING='evolution-data-server 2.24.1.1' PACKAGE_BUGREPORT='' ac_unique_file="README" @@ -1759,7 +1759,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures evolution-data-server 2.24.1 to adapt to many kinds of systems. +\`configure' configures evolution-data-server 2.24.1.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1830,7 +1830,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of evolution-data-server 2.24.1:";; + short | recursive ) echo "Configuration of evolution-data-server 2.24.1.1:";; esac cat <<\_ACEOF @@ -2044,7 +2044,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -evolution-data-server configure 2.24.1 +evolution-data-server configure 2.24.1.1 generated by GNU Autoconf 2.62 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -2058,7 +2058,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by evolution-data-server $as_me 2.24.1, which was +It was created by evolution-data-server $as_me 2.24.1.1, which was generated by GNU Autoconf 2.62. Invocation command line was $ $0 $@ @@ -2778,7 +2778,7 @@ # Define the identity of the package. PACKAGE=evolution-data-server - VERSION=2.24.1 + VERSION=2.24.1.1 cat >>confdefs.h <<_ACEOF @@ -3039,7 +3039,7 @@ EDS_MAJOR_VERSION=2 EDS_MINOR_VERSION=24 -EDS_MICRO_VERSION=1 +EDS_MICRO_VERSION=1.1 # Libtool versioning LIBEDATASERVER_CURRENT=11 @@ -34822,7 +34822,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by evolution-data-server $as_me 2.24.1, which was +This file was extended by evolution-data-server $as_me 2.24.1.1, which was generated by GNU Autoconf 2.62. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -34875,7 +34875,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_version="\\ -evolution-data-server config.status 2.24.1 +evolution-data-server config.status 2.24.1.1 configured by $0, generated by GNU Autoconf 2.62, with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff -Nru evolution-data-server-2.24.1/configure.in evolution-data-server-2.24.1.1/configure.in --- evolution-data-server-2.24.1/configure.in 2008-10-20 05:26:33.000000000 +0200 +++ evolution-data-server-2.24.1.1/configure.in 2008-11-07 06:15:24.000000000 +0100 @@ -4,7 +4,7 @@ # Evolution-Data-Server version */ m4_define([eds_major_version], [2]) m4_define([eds_minor_version], [24]) -m4_define([eds_micro_version], [1]) +m4_define([eds_micro_version], [1.1]) m4_define([eds_version], [eds_major_version.eds_minor_version.eds_micro_version]) diff -Nru evolution-data-server-2.24.1/debian/changelog evolution-data-server-2.24.1.1/debian/changelog --- evolution-data-server-2.24.1/debian/changelog 2008-11-13 15:17:37.000000000 +0100 +++ evolution-data-server-2.24.1.1/debian/changelog 2008-11-13 15:17:42.000000000 +0100 @@ -1,3 +1,30 @@ +evolution-data-server (2.24.1.1-0ubuntu1) intrepid-proposed; urgency=low + + * New upstream version + Bug Fixes: + - #209514: (Novell Bugzilla) Evolution Groupwise missing mails + - #372382: (Novell Bugzilla) VUL-0: OTRS SOAP interface vulnerability + - #434946: (Novell Bugzilla) Deleted Messages in Trash Show Bold and Behave + Like New Messages + - #434950: Newly Fetched Mail Doesn't Update Mailbox Count in + QuickViewer Until Exit and Entry + - #434958: 'Empty Trash' Sometimes Requires Multiple Attempts Before + Initiating + - #435725: Disable Right-Mouse "Delete" On GrouPWise System Email Folders + - #435727: Deleted Shared Folder Crashes Evolution + - #435964: Evo crashed after switching from offline to online + in GW addressbook + - #440502: Tracker Bug: GroupWise Magic Patch Tracker + - #532136: Evolution crashed - modifying a local task and changed offline + state + - #555979: Evolution does not empty trash on exit (lp: #281093) + - #556119: Takes a very long time to index newsgroup. + - #558727: Format string bugs causing potential crashes + - #558737: Evolution freezes on trying to store folder + - #558883: Evolution 2.24 is terribly slow with large IMAP folders. + + -- Sebastien Bacher Thu, 13 Nov 2008 10:48:58 +0100 + evolution-data-server (2.24.1-0ubuntu1) intrepid; urgency=low * New upstream version: diff -Nru evolution-data-server-2.24.1/docs/reference/addressbook/libebook/html/ch01.html evolution-data-server-2.24.1.1/docs/reference/addressbook/libebook/html/ch01.html --- evolution-data-server-2.24.1/docs/reference/addressbook/libebook/html/ch01.html 2008-10-20 10:11:19.000000000 +0200 +++ evolution-data-server-2.24.1.1/docs/reference/addressbook/libebook/html/ch01.html 2008-11-07 07:55:28.000000000 +0100 @@ -2,15 +2,15 @@ -Evolution API Reference: libebook, the Addressbook Library +Evolution-Data-Server Manual: Address Book Client (libebook) - - - + + + - + @@ -18,12 +18,12 @@ Prev   Home -Evolution API Reference: libebook, the Addressbook Library +Evolution-Data-Server Manual: Address Book Client (libebook) Next

-Evolution API Reference: libebook, the Addressbook Library

+Evolution-Data-Server Manual: Address Book Client (libebook)
EBook — The primary Evolution addressbook client object. diff -Nru evolution-data-server-2.24.1/docs/reference/addressbook/libebook/html/EBook.html evolution-data-server-2.24.1.1/docs/reference/addressbook/libebook/html/EBook.html --- evolution-data-server-2.24.1/docs/reference/addressbook/libebook/html/EBook.html 2008-10-20 10:11:19.000000000 +0200 +++ evolution-data-server-2.24.1.1/docs/reference/addressbook/libebook/html/EBook.html 2008-11-07 07:55:28.000000000 +0100 @@ -4,13 +4,13 @@ EBook - - - + + + - + @@ -19,7 +19,7 @@ Prev Up Home -Evolution API Reference: libebook, the Addressbook Library +Evolution-Data-Server Manual: Address Book Client (libebook) Next @@ -45,7 +45,9 @@

Synopsis

                     EBook;
-EBook *             e_book_new                          (ESource *source,
+EBook *             e_book_new                          (ESource *source,
                                                          GError **error);
 EBook *             e_book_new_default_addressbook      (GError **error);
 EBook *             e_book_new_from_uri                 (const char *uri,
@@ -53,7 +55,9 @@
 EBook *             e_book_new_system_addressbook       (GError **error);
 gboolean            e_book_set_default_addressbook      (EBook *book,
                                                          GError **error);
-gboolean            e_book_set_default_source           (ESource *source,
+gboolean            e_book_set_default_source           (ESource *source,
                                                          GError **error);
 gboolean            e_book_remove                       (EBook *book,
                                                          GError **error);
@@ -69,7 +73,9 @@
 gboolean            e_book_get_required_fields          (EBook *book,
                                                          GList **fields,
                                                          GError **error);
-ESource *           e_book_get_source                   (EBook *book);
+ESource *           e_book_get_source                   (EBook *book);
 gboolean            e_book_is_online                    (EBook *book);
 gboolean            e_book_is_opened                    (EBook *book);
 gboolean            e_book_authenticate_user            (EBook *book,
@@ -116,6 +122,8 @@
 gboolean            e_book_is_writable                  (EBook *book);
 gboolean            e_book_cancel                       (EBook *book,
                                                          GError **error);
+gboolean            e_book_cancel_async_op              (EBook *book,
+                                                         GError **error);
 gboolean            e_book_get_self                     (EContact **contact,
                                                          EBook **book,
                                                          GError **error);
@@ -123,7 +131,9 @@
                                                          EContact *contact,
                                                          GError **error);
 gboolean            e_book_is_self                      (EContact *contact);
-gboolean            e_book_get_addressbooks             (ESourceList **addressbook_sources,
+gboolean            e_book_get_addressbooks             (ESourceList **addressbook_sources,
                                                          GError **error);
 void                (*EBookCallback)                    (EBook *book,
                                                          EBookStatus status,
@@ -138,7 +148,9 @@
                                                          gpointer closure);
 void                (*EBookEListCallback)               (EBook *book,
                                                          EBookStatus status,
-                                                         EList *list,
+                                                         EList *list,
                                                          gpointer closure);
 void                (*EBookListCallback)                (EBook *book,
                                                          EBookStatus status,
@@ -250,7 +262,9 @@
 

 

 
e_book_new ()

-
EBook *             e_book_new                          (ESource *source,
+
EBook *             e_book_new                          (ESource *source,
                                                          GError **error);

 

 Creates a new EBook corresponding to the given source.  There are
@@ -263,7 +277,9 @@
 
 
 
source :

- An ESource pointer
+ An ESource pointer
 
 
 
@@ -368,7 +384,9 @@
 
gboolean            e_book_set_default_addressbook      (EBook *book,
                                                          GError **error);

 

-sets the ESource of the EBook as the "default" addressbook.  This is the source
+sets the ESource of the EBook as the "default" addressbook.  This is the source
 that will be loaded in the e_book_get_default_addressbook call.

 

 

@@ -396,7 +414,9 @@
 

 

 
e_book_set_default_source ()

-
gboolean            e_book_set_default_source           (ESource *source,
+
gboolean            e_book_set_default_source           (ESource *source,
                                                          GError **error);

 

 sets source as the "default" addressbook.  This is the source that
@@ -408,7 +428,9 @@
 
 
 
source :

- An ESource pointer
+ An ESource pointer
 
 
 
@@ -610,9 +632,13 @@
 

 

 
e_book_get_source ()

-
ESource *           e_book_get_source                   (EBook *book);

-

-Get the ESource that this book has loaded.

+
ESource *           e_book_get_source                   (EBook *book);

+

+Get the ESource that this book has loaded.

 

 

 

@@ -1229,6 +1255,36 @@
 

+
e_book_cancel_async_op ()

+
gboolean            e_book_cancel_async_op              (EBook *book,
+                                                         GError **error);

+

+

+

+

+

 
 

++
+
+
+
+
+
+
+
+
+
+
+
+
+
+


book :

+
error :

+
Returns :

+

+

+

+

 
e_book_get_self ()

 
gboolean            e_book_get_self                     (EContact **contact,
                                                          EBook **book,
@@ -1328,7 +1384,9 @@
 

 

 
e_book_get_addressbooks ()

-
gboolean            e_book_get_addressbooks             (ESourceList **addressbook_sources,
+
gboolean            e_book_get_addressbooks             (ESourceList **addressbook_sources,
                                                          GError **error);

 

 Populate *addressbook_sources with the list of all sources which have been
@@ -1460,7 +1518,9 @@
 
EBookEListCallback ()

 
void                (*EBookEListCallback)               (EBook *book,
                                                          EBookStatus status,
-                                                         EList *list,
+                                                         EList *list,
                                                          gpointer closure);

 

 

diff -Nru evolution-data-server-2.24.1/docs/reference/addressbook/libebook/html/EBookListener.html evolution-data-server-2.24.1.1/docs/reference/addressbook/libebook/html/EBookListener.html
--- evolution-data-server-2.24.1/docs/reference/addressbook/libebook/html/EBookListener.html	2008-10-20 10:11:19.000000000 +0200
+++ evolution-data-server-2.24.1.1/docs/reference/addressbook/libebook/html/EBookListener.html	2008-11-07 07:55:28.000000000 +0100
@@ -4,13 +4,13 @@
 
 EBookListener
 
-
-
+
+
 
 
 
 
-
+
 
 
 
@@ -19,7 +19,7 @@
 Prev
 Up
 Home
-Evolution API Reference: libebook, the Addressbook Library
+Evolution-Data-Server Manual: Address Book Client (libebook)
 Next
 
 
diff -Nru evolution-data-server-2.24.1/docs/reference/addressbook/libebook/html/EBookView.html evolution-data-server-2.24.1.1/docs/reference/addressbook/libebook/html/EBookView.html
--- evolution-data-server-2.24.1/docs/reference/addressbook/libebook/html/EBookView.html	2008-10-20 10:11:19.000000000 +0200
+++ evolution-data-server-2.24.1.1/docs/reference/addressbook/libebook/html/EBookView.html	2008-11-07 07:55:28.000000000 +0100
@@ -4,13 +4,13 @@
 
 EBookView
 
-
-
+
+
 
 
 
 
-
+
 
 
 
@@ -19,7 +19,7 @@
 Prev
 Up
 Home
-Evolution API Reference: libebook, the Addressbook Library
+Evolution-Data-Server Manual: Address Book Client (libebook)
 Next
 
 
diff -Nru evolution-data-server-2.24.1/docs/reference/addressbook/libebook/html/EBookViewListener.html evolution-data-server-2.24.1.1/docs/reference/addressbook/libebook/html/EBookViewListener.html
--- evolution-data-server-2.24.1/docs/reference/addressbook/libebook/html/EBookViewListener.html	2008-10-20 10:11:19.000000000 +0200
+++ evolution-data-server-2.24.1.1/docs/reference/addressbook/libebook/html/EBookViewListener.html	2008-11-07 07:55:28.000000000 +0100
@@ -4,13 +4,13 @@
 
 EBookViewListener
 
-
-
+
+
 
 
 
 
-
+
 
 
 
@@ -19,7 +19,7 @@
 Prev
 Up
 Home
-Evolution API Reference: libebook, the Addressbook Library
+Evolution-Data-Server Manual: Address Book Client (libebook)
 Next
 
 
diff -Nru evolution-data-server-2.24.1/docs/reference/addressbook/libebook/html/EContact.html evolution-data-server-2.24.1.1/docs/reference/addressbook/libebook/html/EContact.html
--- evolution-data-server-2.24.1/docs/reference/addressbook/libebook/html/EContact.html	2008-10-20 10:11:19.000000000 +0200
+++ evolution-data-server-2.24.1.1/docs/reference/addressbook/libebook/html/EContact.html	2008-11-07 07:55:28.000000000 +0100
@@ -4,13 +4,13 @@
 
 EContact
 
-
-
+
+
 
 
 
 
-
+
 
 
 
@@ -19,7 +19,7 @@
 Prev
 Up
 Home
-Evolution API Reference: libebook, the Addressbook Library
+Evolution-Data-Server Manual: Address Book Client (libebook)
 Next
 
 
diff -Nru evolution-data-server-2.24.1/docs/reference/addressbook/libebook/html/EDestination.html evolution-data-server-2.24.1.1/docs/reference/addressbook/libebook/html/EDestination.html
--- evolution-data-server-2.24.1/docs/reference/addressbook/libebook/html/EDestination.html	2008-10-20 10:11:19.000000000 +0200
+++ evolution-data-server-2.24.1.1/docs/reference/addressbook/libebook/html/EDestination.html	2008-11-07 07:55:28.000000000 +0100
@@ -4,13 +4,13 @@
 
 EDestination
 
-
-
+
+
 
 
 
 
-
+
 
 
 
@@ -19,7 +19,7 @@
 Prev
 Up
 Home
-Evolution API Reference: libebook, the Addressbook Library
+Evolution-Data-Server Manual: Address Book Client (libebook)
 Next
 
 
diff -Nru evolution-data-server-2.24.1/docs/reference/addressbook/libebook/html/EVCard.html evolution-data-server-2.24.1.1/docs/reference/addressbook/libebook/html/EVCard.html
--- evolution-data-server-2.24.1/docs/reference/addressbook/libebook/html/EVCard.html	2008-10-20 10:11:19.000000000 +0200
+++ evolution-data-server-2.24.1.1/docs/reference/addressbook/libebook/html/EVCard.html	2008-11-07 07:55:28.000000000 +0100
@@ -4,13 +4,13 @@
 
 EVCard
 
-
-
+
+
 
 
 
 
-
+
 
 
 
@@ -19,7 +19,7 @@
 Prev
 Up
 Home
-Evolution API Reference: libebook, the Addressbook Library
+Evolution-Data-Server Manual: Address Book Client (libebook)
 Next
 
 
diff -Nru evolution-data-server-2.24.1/docs/reference/addressbook/libebook/html/index.html evolution-data-server-2.24.1.1/docs/reference/addressbook/libebook/html/index.html
--- evolution-data-server-2.24.1/docs/reference/addressbook/libebook/html/index.html	2008-10-20 10:11:19.000000000 +0200
+++ evolution-data-server-2.24.1.1/docs/reference/addressbook/libebook/html/index.html	2008-11-07 07:55:28.000000000 +0100
@@ -2,23 +2,23 @@
 
 
 
-Evolution API Reference: libebook, the Addressbook Library
+Evolution-Data-Server Manual: Address Book Client (libebook)
 
-
-
+
+
 
 
-
+
 
 
 
 

 

-

+

 

 

 

-
Evolution API Reference: libebook, the Addressbook Library

+
Evolution-Data-Server Manual: Address Book Client (libebook)

 

 

 EBook — The primary Evolution addressbook client object.
diff -Nru evolution-data-server-2.24.1/docs/reference/addressbook/libebook/html/index.sgml evolution-data-server-2.24.1.1/docs/reference/addressbook/libebook/html/index.sgml
--- evolution-data-server-2.24.1/docs/reference/addressbook/libebook/html/index.sgml	2008-10-20 10:11:19.000000000 +0200
+++ evolution-data-server-2.24.1.1/docs/reference/addressbook/libebook/html/index.sgml	2008-11-07 07:55:28.000000000 +0100
@@ -34,6 +34,7 @@
 
 
 
+
 
 
 
diff -Nru evolution-data-server-2.24.1/docs/reference/addressbook/libebook/html/ix01.html evolution-data-server-2.24.1.1/docs/reference/addressbook/libebook/html/ix01.html
--- evolution-data-server-2.24.1/docs/reference/addressbook/libebook/html/ix01.html	2008-10-20 10:11:19.000000000 +0200
+++ evolution-data-server-2.24.1.1/docs/reference/addressbook/libebook/html/ix01.html	2008-11-07 07:55:28.000000000 +0100
@@ -4,12 +4,12 @@
 
 Index
 
-
-
+
+
 
 
 
-
+
 
 
 
@@ -17,7 +17,7 @@
 Prev
  
 Home
-Evolution API Reference: libebook, the Addressbook Library
+Evolution-Data-Server Manual: Address Book Client (libebook)
  
 
 

@@ -518,6 +518,8 @@
 

 
e_book_cancel, e_book_cancel ()
 

+
e_book_cancel_async_op, e_book_cancel_async_op ()
+

 
e_book_check_static_capability, e_book_check_static_capability ()
 

 
e_book_commit_contact, e_book_commit_contact ()
diff -Nru evolution-data-server-2.24.1/docs/reference/addressbook/libebook/html/libebook.devhelp evolution-data-server-2.24.1.1/docs/reference/addressbook/libebook/html/libebook.devhelp
--- evolution-data-server-2.24.1/docs/reference/addressbook/libebook/html/libebook.devhelp	2008-10-20 10:11:19.000000000 +0200
+++ evolution-data-server-2.24.1.1/docs/reference/addressbook/libebook/html/libebook.devhelp	2008-11-07 07:55:28.000000000 +0100
@@ -1,8 +1,8 @@
 
 
-
+
   
-    
+    
       
       
       
@@ -48,6 +48,7 @@
     
     
     
+    
     
     
     
diff -Nru evolution-data-server-2.24.1/docs/reference/addressbook/libebook/html/libebook.devhelp2 evolution-data-server-2.24.1.1/docs/reference/addressbook/libebook/html/libebook.devhelp2
--- evolution-data-server-2.24.1/docs/reference/addressbook/libebook/html/libebook.devhelp2	2008-10-20 10:11:19.000000000 +0200
+++ evolution-data-server-2.24.1.1/docs/reference/addressbook/libebook/html/libebook.devhelp2	2008-11-07 07:55:28.000000000 +0100
@@ -1,8 +1,8 @@
 
 
-
+
   
-    
+    
       
       
       
@@ -48,6 +48,7 @@
     
     
     
+    
     
     
     
diff -Nru evolution-data-server-2.24.1/docs/reference/addressbook/libebook/html/libebook-EAddressWestern.html evolution-data-server-2.24.1.1/docs/reference/addressbook/libebook/html/libebook-EAddressWestern.html
--- evolution-data-server-2.24.1/docs/reference/addressbook/libebook/html/libebook-EAddressWestern.html	2008-10-20 10:11:19.000000000 +0200
+++ evolution-data-server-2.24.1.1/docs/reference/addressbook/libebook/html/libebook-EAddressWestern.html	2008-11-07 07:55:28.000000000 +0100
@@ -4,13 +4,13 @@
 
 e-address-western
 
-
-
+
+
 
 
 
 
-
+
 
 
 
@@ -19,7 +19,7 @@
 Prev
 Up
 Home
-Evolution API Reference: libebook, the Addressbook Library
+Evolution-Data-Server Manual: Address Book Client (libebook)
 Next
 
 
diff -Nru evolution-data-server-2.24.1/docs/reference/addressbook/libebook/html/libebook-e-book-query.html evolution-data-server-2.24.1.1/docs/reference/addressbook/libebook/html/libebook-e-book-query.html
--- evolution-data-server-2.24.1/docs/reference/addressbook/libebook/html/libebook-e-book-query.html	2008-10-20 10:11:19.000000000 +0200
+++ evolution-data-server-2.24.1.1/docs/reference/addressbook/libebook/html/libebook-e-book-query.html	2008-11-07 07:55:28.000000000 +0100
@@ -4,13 +4,13 @@
 
 e-book-query
 
-
-
+
+
 
 
 
 
-
+
 
 
 
@@ -19,7 +19,7 @@
 Prev
 Up
 Home
-Evolution API Reference: libebook, the Addressbook Library
+Evolution-Data-Server Manual: Address Book Client (libebook)
 Next
 
 
diff -Nru evolution-data-server-2.24.1/docs/reference/addressbook/libebook/html/libebook-e-book-types.html evolution-data-server-2.24.1.1/docs/reference/addressbook/libebook/html/libebook-e-book-types.html
--- evolution-data-server-2.24.1/docs/reference/addressbook/libebook/html/libebook-e-book-types.html	2008-10-20 10:11:19.000000000 +0200
+++ evolution-data-server-2.24.1.1/docs/reference/addressbook/libebook/html/libebook-e-book-types.html	2008-11-07 07:55:28.000000000 +0100
@@ -4,13 +4,13 @@
 
 e-book-types
 
-
-
+
+
 
 
 
 
-
+
 
 
 
@@ -19,7 +19,7 @@
 Prev
 Up
 Home
-Evolution API Reference: libebook, the Addressbook Library
+Evolution-Data-Server Manual: Address Book Client (libebook)
 Next
 
 
diff -Nru evolution-data-server-2.24.1/docs/reference/addressbook/libebook/html/libebook-ENameWestern.html evolution-data-server-2.24.1.1/docs/reference/addressbook/libebook/html/libebook-ENameWestern.html
--- evolution-data-server-2.24.1/docs/reference/addressbook/libebook/html/libebook-ENameWestern.html	2008-10-20 10:11:19.000000000 +0200
+++ evolution-data-server-2.24.1.1/docs/reference/addressbook/libebook/html/libebook-ENameWestern.html	2008-11-07 07:55:28.000000000 +0100
@@ -4,13 +4,13 @@
 
 e-name-western
 
-
-
+
+
 
 
 
 
-
+
 
 
 
@@ -19,7 +19,7 @@
 Prev
 Up
 Home
-Evolution API Reference: libebook, the Addressbook Library
+Evolution-Data-Server Manual: Address Book Client (libebook)
 Next
 
 
diff -Nru evolution-data-server-2.24.1/docs/reference/addressbook/libebook/libebook-docs.sgml evolution-data-server-2.24.1.1/docs/reference/addressbook/libebook/libebook-docs.sgml
--- evolution-data-server-2.24.1/docs/reference/addressbook/libebook/libebook-docs.sgml	2008-10-13 10:07:58.000000000 +0200
+++ evolution-data-server-2.24.1.1/docs/reference/addressbook/libebook/libebook-docs.sgml	2008-11-07 05:34:23.000000000 +0100
@@ -3,11 +3,11 @@
                "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd">
 
   
-    Evolution API Reference: libebook, the Addressbook Library
+    Evolution-Data-Server Manual: Address Book Client (libebook)
   
 
   
-    Evolution API Reference: libebook, the Addressbook Library
+    Evolution-Data-Server Manual: Address Book Client (libebook)
     
     
     
diff -Nru evolution-data-server-2.24.1/docs/reference/addressbook/libebook/libebook-sections.txt evolution-data-server-2.24.1.1/docs/reference/addressbook/libebook/libebook-sections.txt
--- evolution-data-server-2.24.1/docs/reference/addressbook/libebook/libebook-sections.txt	2008-10-13 10:07:58.000000000 +0200
+++ evolution-data-server-2.24.1.1/docs/reference/addressbook/libebook/libebook-sections.txt	2008-11-07 05:34:23.000000000 +0100
@@ -96,6 +96,7 @@
 e_book_check_static_capability
 e_book_is_writable
 e_book_cancel
+e_book_cancel_async_op
 e_book_get_self
 e_book_set_self
 e_book_is_self
diff -Nru evolution-data-server-2.24.1/docs/reference/addressbook/libebook/tmpl/e-book.sgml evolution-data-server-2.24.1.1/docs/reference/addressbook/libebook/tmpl/e-book.sgml
--- evolution-data-server-2.24.1/docs/reference/addressbook/libebook/tmpl/e-book.sgml	2008-10-20 10:11:19.000000000 +0200
+++ evolution-data-server-2.24.1.1/docs/reference/addressbook/libebook/tmpl/e-book.sgml	2008-11-07 07:55:28.000000000 +0100
@@ -357,6 +357,16 @@
 @Returns: 
 
 
+
+
+
+
+
+@book: 
+@error: 
+@Returns: 
+
+
 
 
 
diff -Nru evolution-data-server-2.24.1/docs/reference/addressbook/libebook/xml/api-index-full.xml evolution-data-server-2.24.1.1/docs/reference/addressbook/libebook/xml/api-index-full.xml
--- evolution-data-server-2.24.1/docs/reference/addressbook/libebook/xml/api-index-full.xml	2008-10-20 10:11:19.000000000 +0200
+++ evolution-data-server-2.24.1.1/docs/reference/addressbook/libebook/xml/api-index-full.xml	2008-11-07 07:55:28.000000000 +0100
@@ -249,6 +249,7 @@
 e_book_async_remove_contact_by_id
 e_book_authenticate_user
 e_book_cancel
+e_book_cancel_async_op
 e_book_check_static_capability
 e_book_commit_contact
 E_BOOK_ERROR
diff -Nru evolution-data-server-2.24.1/docs/reference/addressbook/libebook/xml/e-book.xml evolution-data-server-2.24.1.1/docs/reference/addressbook/libebook/xml/e-book.xml
--- evolution-data-server-2.24.1/docs/reference/addressbook/libebook/xml/e-book.xml	2008-10-20 10:11:19.000000000 +0200
+++ evolution-data-server-2.24.1.1/docs/reference/addressbook/libebook/xml/e-book.xml	2008-11-07 07:55:28.000000000 +0100
@@ -89,6 +89,8 @@
 gboolean            e_book_is_writable                  (EBook *book);
 gboolean            e_book_cancel                       (EBook *book,
                                                          GError **error);
+gboolean            e_book_cancel_async_op              (EBook *book,
+                                                         GError **error);
 gboolean            e_book_get_self                     (EContact **contact,
                                                          EBook **book,
                                                          GError **error);
@@ -811,6 +813,23 @@
 Returns : TRUE on success, FALSE otherwise
 
 
+
+e_book_cancel_async_op ()
+e_book_cancel_async_opgboolean            e_book_cancel_async_op              (EBook *book,
+                                                         GError **error);
+
+
+
+
+book :
+
+
+error :
+
+
+Returns :
+
+
 
 e_book_get_self ()
 e_book_get_selfgboolean            e_book_get_self                     (EContact **contact,
diff -Nru evolution-data-server-2.24.1/docs/reference/addressbook/libedata-book/html/ch01.html evolution-data-server-2.24.1.1/docs/reference/addressbook/libedata-book/html/ch01.html
--- evolution-data-server-2.24.1/docs/reference/addressbook/libedata-book/html/ch01.html	2008-10-20 10:11:19.000000000 +0200
+++ evolution-data-server-2.24.1.1/docs/reference/addressbook/libedata-book/html/ch01.html	2008-11-07 07:55:28.000000000 +0100
@@ -2,15 +2,15 @@
 
 
 
-Evolution API Reference: libedata-book, the Addressbook backend library
+Evolution-Data-Server Manual: Address Book Backend (libedata-book)
 
-
-
-
+
+
+
 
 
 
-
+
 
 
 
@@ -18,12 +18,12 @@
 Prev
  
 Home
-Evolution API Reference: libedata-book, the Addressbook backend library
+Evolution-Data-Server Manual: Address Book Backend (libedata-book)
 Next
 
 

 

-Evolution API Reference: libedata-book, the Addressbook backend library

+Evolution-Data-Server Manual: Address Book Backend (libedata-book)

 

 

 EBookBackend
diff -Nru evolution-data-server-2.24.1/docs/reference/addressbook/libedata-book/html/EBookBackendCache.html evolution-data-server-2.24.1.1/docs/reference/addressbook/libedata-book/html/EBookBackendCache.html
--- evolution-data-server-2.24.1/docs/reference/addressbook/libedata-book/html/EBookBackendCache.html	2008-10-20 10:11:19.000000000 +0200
+++ evolution-data-server-2.24.1.1/docs/reference/addressbook/libedata-book/html/EBookBackendCache.html	2008-11-07 07:55:28.000000000 +0100
@@ -4,13 +4,13 @@
 
 EBookBackendCache
 
-
-
+
+
 
 
 
 
-
+
 
 
 
@@ -19,7 +19,7 @@
 Prev
 Up
 Home
-Evolution API Reference: libedata-book, the Addressbook backend library
+Evolution-Data-Server Manual: Address Book Backend (libedata-book)
 Next
 
 
@@ -46,10 +46,14 @@
 
                     EBookBackendCache;
 EBookBackendCache*  e_book_backend_cache_new            (const char *uri);
-EContact*           e_book_backend_cache_get_contact    (EBookBackendCache *cache,
+EContact*           e_book_backend_cache_get_contact    (EBookBackendCache *cache,
                                                          const char *uid);
 gboolean            e_book_backend_cache_add_contact    (EBookBackendCache *cache,
-                                                         EContact *contact);
+                                                         EContact *contact);
 gboolean            e_book_backend_cache_remove_contact (EBookBackendCache *cache,
                                                          const char *uid);
 gboolean            e_book_backend_cache_check_contact  (EBookBackendCache *cache,
@@ -70,7 +74,9 @@
 
Object Hierarchy

 
   GObject
-   +----EFileCache
+   +----EFileCache
          +----EBookBackendCache
 

 

@@ -99,7 +105,9 @@
 
EBookBackendCache*  e_book_backend_cache_new            (const char *uri);

 

 Creates a new EBookBackendCache object, which implements a local
-cache of EContact objects, useful for remote backends.

+cache of EContact objects, useful for remote backends.

 

 

 

@@ -121,10 +129,14 @@
 

 
e_book_backend_cache_get_contact ()

-
EContact*           e_book_backend_cache_get_contact    (EBookBackendCache *cache,
+
EContact*           e_book_backend_cache_get_contact    (EBookBackendCache *cache,
                                                          const char *uid);

 

-Get a cached contact. Note that the returned EContact will be
+Get a cached contact. Note that the returned EContact will be
 newly created, and must be unreffed by the caller when no longer
 needed.

 

@@ -144,7 +156,9 @@
 
 

-
@@ -154,7 +168,9 @@
 

 
e_book_backend_cache_add_contact ()

 
gboolean            e_book_backend_cache_add_contact    (EBookBackendCache *cache,
-                                                         EContact *contact);

+                                                         EContact *contact);
 

 Adds contact to cache.

 

@@ -169,7 +185,9 @@
 
 

-
@@ -246,7 +264,9 @@
 
GList*              e_book_backend_cache_get_contacts   (EBookBackendCache *cache,
                                                          const char *query);

-Returns a list of EContact elements from cache matching query.
+Returns a list of EContact elements from cache matching query.
 When done with the list, the caller must unref the contacts and
 free the list.

@@ -266,7 +286,9 @@
 

-
diff -Nru evolution-data-server-2.24.1/docs/reference/addressbook/libedata-book/html/EBookBackendFactory.html evolution-data-server-2.24.1.1/docs/reference/addressbook/libedata-book/html/EBookBackendFactory.html
--- evolution-data-server-2.24.1/docs/reference/addressbook/libedata-book/html/EBookBackendFactory.html	2008-10-20 10:11:19.000000000 +0200
+++ evolution-data-server-2.24.1.1/docs/reference/addressbook/libedata-book/html/EBookBackendFactory.html	2008-11-07 07:55:28.000000000 +0100
@@ -4,13 +4,13 @@
 EBookBackendFactory
-
-
+
+
-
+
@@ -19,7 +19,7 @@
 
-
+
-
+
-
@@ -241,7 +253,9 @@
 

 
e_book_backend_get_source ()

-
ESource *           e_book_backend_get_source           (EBookBackend *backend);

+
ESource *           e_book_backend_get_source           (EBookBackend *backend);

 

 Queries the source that an addressbook backend is serving.

 

@@ -1047,7 +1061,9 @@
 

 

 
e_book_backend_get_book_views ()

-
EList *             e_book_backend_get_book_views       (EBookBackend *backend);

+
EList *             e_book_backend_get_book_views       (EBookBackend *backend);

 

 Gets the list of EDataBookView views running on this backend.

 

@@ -1062,7 +1078,9 @@
 

-
@@ -1072,7 +1090,9 @@
 

 
e_book_backend_notify_update ()

 
void                e_book_backend_notify_update        (EBookBackend *backend,
-                                                         EContact *contact);

+                                                         EContact *contact);
 

 Notifies all of backend's book views about the new or modified
 contacts contact.
diff -Nru evolution-data-server-2.24.1/docs/reference/addressbook/libedata-book/html/EBookBackendSExp.html evolution-data-server-2.24.1.1/docs/reference/addressbook/libedata-book/html/EBookBackendSExp.html
--- evolution-data-server-2.24.1/docs/reference/addressbook/libedata-book/html/EBookBackendSExp.html	2008-10-20 10:11:19.000000000 +0200
+++ evolution-data-server-2.24.1.1/docs/reference/addressbook/libedata-book/html/EBookBackendSExp.html	2008-11-07 07:55:28.000000000 +0100
@@ -4,13 +4,13 @@
 
 EBookBackendSExp
 
-
-
+
+
 
 
 
 
-
+
 
 
 
@@ -19,7 +19,7 @@
 

-
+
-
diff -Nru evolution-data-server-2.24.1/docs/reference/addressbook/libedata-book/html/EBookBackendSummary.html evolution-data-server-2.24.1.1/docs/reference/addressbook/libedata-book/html/EBookBackendSummary.html
--- evolution-data-server-2.24.1/docs/reference/addressbook/libedata-book/html/EBookBackendSummary.html	2008-10-20 10:11:19.000000000 +0200
+++ evolution-data-server-2.24.1.1/docs/reference/addressbook/libedata-book/html/EBookBackendSummary.html	2008-11-07 07:55:28.000000000 +0100
@@ -4,13 +4,13 @@
 EBookBackendSummary
-
-
+
+
-
+
@@ -19,7 +19,7 @@
 
-
+
-
diff -Nru evolution-data-server-2.24.1/docs/reference/addressbook/libedata-book/html/EBookBackendSync.html evolution-data-server-2.24.1.1/docs/reference/addressbook/libedata-book/html/EBookBackendSync.html
--- evolution-data-server-2.24.1/docs/reference/addressbook/libedata-book/html/EBookBackendSync.html	2008-10-20 10:11:19.000000000 +0200
+++ evolution-data-server-2.24.1.1/docs/reference/addressbook/libedata-book/html/EBookBackendSync.html	2008-11-07 07:55:28.000000000 +0100
@@ -4,13 +4,13 @@
 EBookBackendSync
-
-
+
+
-
+
@@ -19,7 +19,7 @@
 
-
+
-
@@ -304,7 +312,9 @@
                                                          EDataBook *book,
                                                          guint32 opid,
                                                          const char *vcard,
-                                                         EContact **contact);
+                                                         EContact **contact);

 Modifies the contact specified by the ID embedded in vcard, to
 reflect the full contents of vcard.

@@ -335,7 +345,9 @@
 
-
@@ -559,7 +571,9 @@
                                                          GList **fields);

 Gets a list of the fields required for all contacts in book. The
-fields are represented by strings from e_contact_field_name. The list
+fields are represented by strings from e_contact_field_name. The list
 and its contents must be freed by the caller.

 

@@ -604,7 +618,9 @@
                                                          GList **fields);

 Gets a list of the fields supported for contacts in book. Other fields
-may not be stored. The fields are represented by strings from e_contact_field_name.
+may not be stored. The fields are represented by strings from e_contact_field_name.
 The list and its contents must be freed by the caller.

 

diff -Nru evolution-data-server-2.24.1/docs/reference/addressbook/libedata-book/html/EDataBook.html evolution-data-server-2.24.1.1/docs/reference/addressbook/libedata-book/html/EDataBook.html
--- evolution-data-server-2.24.1/docs/reference/addressbook/libedata-book/html/EDataBook.html	2008-10-20 10:11:19.000000000 +0200
+++ evolution-data-server-2.24.1.1/docs/reference/addressbook/libedata-book/html/EDataBook.html	2008-11-07 07:55:28.000000000 +0100
@@ -4,13 +4,13 @@
 EDataBook
-
-
+
+
-
+
@@ -19,7 +19,7 @@
 
-
+
-
@@ -222,9 +234,13 @@
 

 
e_data_book_get_source ()

-
ESource *           e_data_book_get_source              (EDataBook *book);

-

-Gets the ESource associated with book.

+
ESource *           e_data_book_get_source              (EDataBook *book);

+

+Gets the ESource associated with book.

 

 

 

 

 
Returns :
 A cached EContact, or NULL if uid is not cached.
+ A cached EContact, or NULL if uid is not cached.
 
 

 

 
contact :
 an EContact
+ an EContact
 
 

 

 
 

 

 
Returns :
 A GList of pointers to EContact.
+ A GList of pointers to EContact.
 
 

 
 
 
 
 
 
 
 
 
 
Prev
 Up
 HomeEvolution API Reference: libedata-book, the Addressbook backend libraryEvolution-Data-Server Manual: Address Book Backend (libedata-book)
 Next
 

 

diff -Nru evolution-data-server-2.24.1/docs/reference/addressbook/libedata-book/html/EBookBackend.html evolution-data-server-2.24.1.1/docs/reference/addressbook/libedata-book/html/EBookBackend.html
--- evolution-data-server-2.24.1/docs/reference/addressbook/libedata-book/html/EBookBackend.html	2008-10-20 10:11:19.000000000 +0200
+++ evolution-data-server-2.24.1.1/docs/reference/addressbook/libedata-book/html/EBookBackend.html	2008-11-07 07:55:28.000000000 +0100
@@ -4,13 +4,13 @@
 
 EBookBackend
 
-
-
-
+
+
+
 
 
 
-
+
 
 
 
@@ -19,7 +19,7 @@
 Prev
 Up
 HomeEvolution API Reference: libedata-book, the Addressbook backend libraryEvolution-Data-Server Manual: Address Book Backend (libedata-book)
 Next
 

 

@@ -48,9 +48,13 @@
 gboolean            e_book_backend_construct            (EBookBackend *backend);
 GNOME_Evolution_Addressbook_CallStatus  e_book_backend_load_source
                                                         (EBookBackend *backend,
-                                                         ESource *source,
+                                                         ESource *source,
                                                          gboolean only_if_exists);
-ESource *           e_book_backend_get_source           (EBookBackend *backend);
+ESource *           e_book_backend_get_source           (EBookBackend *backend);
 gboolean            e_book_backend_add_client           (EBookBackend *backend,
                                                          EDataBook *book);
 void                e_book_backend_remove_client        (EBookBackend *backend,
@@ -122,9 +126,13 @@
                                                          EDataBookView *view);
 void                e_book_backend_remove_book_view     (EBookBackend *backend,
                                                          EDataBookView *view);
-EList *             e_book_backend_get_book_views       (EBookBackend *backend);
+EList *             e_book_backend_get_book_views       (EBookBackend *backend);
 void                e_book_backend_notify_update        (EBookBackend *backend,
-                                                         EContact *contact);
+                                                         EContact *contact);
 void                e_book_backend_notify_remove        (EBookBackend *backend,
                                                          const char *id);
 void                e_book_backend_notify_complete      (EBookBackend *backend);
@@ -206,7 +214,9 @@
 
e_book_backend_load_source ()

 
GNOME_Evolution_Addressbook_CallStatus  e_book_backend_load_source
                                                         (EBookBackend *backend,
-                                                         ESource *source,
+                                                         ESource *source,
                                                          gboolean only_if_exists);

 

 Loads source into backend.

@@ -222,7 +232,9 @@
 

 

 
source :
 an ESource to load
+ an ESource to load
 
 

 

 

 

 
Returns :
 An EList of EDataBookView objects.
+ An EList of EDataBookView objects.
 
 

 
Prev
 Up
 HomeEvolution API Reference: libedata-book, the Addressbook backend libraryEvolution-Data-Server Manual: Address Book Backend (libedata-book)
 Next
 

 

@@ -47,7 +47,9 @@
 gboolean            e_book_backend_sexp_match_vcard     (EBookBackendSExp *sexp,
                                                          const char *vcard);
 gboolean            e_book_backend_sexp_match_contact   (EBookBackendSExp *sexp,
-                                                         EContact *contact);
+                                                         EContact *contact);
 
 
 

@@ -128,7 +130,9 @@
 

 
e_book_backend_sexp_match_contact ()

 
gboolean            e_book_backend_sexp_match_contact   (EBookBackendSExp *sexp,
-                                                         EContact *contact);

+                                                         EContact *contact);
 

 Checks if contact matches sexp.

 

@@ -143,7 +147,9 @@
 

 

 
contact :
 an EContact
+ an EContact
 
 

 

 
 
 
 
 
 
 
 
 Prev
 Up
 HomeEvolution API Reference: libedata-book, the Addressbook backend libraryEvolution-Data-Server Manual: Address Book Backend (libedata-book)
 Next
 

 

@@ -48,7 +48,9 @@
 gboolean            e_book_backend_summary_load         (EBookBackendSummary *summary);
 gboolean            e_book_backend_summary_save         (EBookBackendSummary *summary);
 void                e_book_backend_summary_add_contact  (EBookBackendSummary *summary,
-                                                         EContact *contact);
+                                                         EContact *contact);
 void                e_book_backend_summary_remove_contact
                                                         (EBookBackendSummary *summary,
                                                          const char *id);
@@ -176,7 +178,9 @@
 

 
e_book_backend_summary_add_contact ()

 
void                e_book_backend_summary_add_contact  (EBookBackendSummary *summary,
-                                                         EContact *contact);

+                                                         EContact *contact);
 

 Adds a summary of contact to summary. Does not check if
 the contact already has a summary.

@@ -192,7 +196,9 @@
 

 

 
contact :
 an EContact to add
+ an EContact to add
 
 

 
 
 
 
 
 
 
 
 
 
Prev
 Up
 HomeEvolution API Reference: libedata-book, the Addressbook backend libraryEvolution-Data-Server Manual: Address Book Backend (libedata-book)
 Next
 

 

@@ -53,7 +53,9 @@
                                                          EDataBook *book,
                                                          guint32 opid,
                                                          const char *vcard,
-                                                         EContact **contact);
+                                                         EContact **contact);
 EBookBackendSyncStatus  e_book_backend_sync_remove_contacts
                                                         (EBookBackendSync *backend,
                                                          EDataBook *book,
@@ -65,7 +67,9 @@
                                                          EDataBook *book,
                                                          guint32 opid,
                                                          const char *vcard,
-                                                         EContact **contact);
+                                                         EContact **contact);
 EBookBackendSyncStatus  e_book_backend_sync_get_contact (EBookBackendSync *backend,
                                                          EDataBook *book,
                                                          guint32 opid,
@@ -204,7 +208,9 @@
                                                          EDataBook *book,
                                                          guint32 opid,
                                                          const char *vcard,
-                                                         EContact **contact);
+                                                         EContact **contact);
 

 Creates a new contact with the contents of vcard in backend.

 

@@ -234,7 +240,9 @@
 

 

 
contact :
 a pointer to a location to store the resulting EContact
+ a pointer to a location to store the resulting EContact
 
 

 

 

 

 
contact :
 a pointer to a location to store the resulting EContact
+ a pointer to a location to store the resulting EContact
 
 

 

 
 
 
 
 
 
 
 
 
 
 
 
 Prev
 Up
 HomeEvolution API Reference: libedata-book, the Addressbook backend libraryEvolution-Data-Server Manual: Address Book Backend (libedata-book)
 Next
 

 

@@ -44,12 +44,16 @@
 
 struct              EDataBook;
 EDataBook *         e_data_book_new                     (EBookBackend *backend,
-                                                         ESource *source,
+                                                         ESource *source,
                                                          GNOME_Evolution_Addressbook_BookListener listener);
 GNOME_Evolution_Addressbook_BookListener  e_data_book_get_listener
                                                         (EDataBook *book);
 EBookBackend *      e_data_book_get_backend             (EDataBook *book);
-ESource *           e_data_book_get_source              (EDataBook *book);
+ESource *           e_data_book_get_source              (EDataBook *book);
 void                e_data_book_respond_open            (EDataBook *book,
                                                          guint32 opid,
                                                          GNOME_Evolution_Addressbook_CallStatus status);
@@ -59,7 +63,9 @@
 void                e_data_book_respond_create          (EDataBook *book,
                                                          guint32 opid,
                                                          GNOME_Evolution_Addressbook_CallStatus status,
-                                                         EContact *contact);
+                                                         EContact *contact);
 void                e_data_book_respond_remove_contacts (EDataBook *book,
                                                          guint32 opid,
                                                          GNOME_Evolution_Addressbook_CallStatus status,
@@ -67,7 +73,9 @@
 void                e_data_book_respond_modify          (EDataBook *book,
                                                          guint32 opid,
                                                          GNOME_Evolution_Addressbook_CallStatus status,
-                                                         EContact *contact);
+                                                         EContact *contact);
 void                e_data_book_respond_authenticate_user
                                                         (EDataBook *book,
                                                          guint32 opid,
@@ -137,7 +145,9 @@
 

 
e_data_book_new ()

 
EDataBook *         e_data_book_new                     (EBookBackend *backend,
-                                                         ESource *source,
+                                                         ESource *source,
                                                          GNOME_Evolution_Addressbook_BookListener listener);

 

 Create a new EDataBook using backend for storage, source as the
@@ -154,7 +164,9 @@
 

 

 
source :
 an ESource
+ an ESource
 
 

 

 

@@ -237,7 +253,9 @@
 
-
@@ -313,7 +331,9 @@
 
void                e_data_book_respond_create          (EDataBook *book,
                                                          guint32 opid,
                                                          GNOME_Evolution_Addressbook_CallStatus status,
-                                                         EContact *contact);

+                                                         EContact *contact);

 Respond to a 'create' request specified by opid on book,
 indicating status as the outcome.

@@ -389,7 +409,9 @@
 
void                e_data_book_respond_modify          (EDataBook *book,
                                                          guint32 opid,
                                                          GNOME_Evolution_Addressbook_CallStatus status,
-                                                         EContact *contact);

+                                                         EContact *contact);

 Respond to a 'modify' request specified by opid on book,
 indicating status as the outcome.

@@ -415,7 +437,9 @@
 
-
diff -Nru evolution-data-server-2.24.1/docs/reference/addressbook/libedata-book/html/EDataBookView.html evolution-data-server-2.24.1.1/docs/reference/addressbook/libedata-book/html/EDataBookView.html
--- evolution-data-server-2.24.1/docs/reference/addressbook/libedata-book/html/EDataBookView.html	2008-10-20 10:11:19.000000000 +0200
+++ evolution-data-server-2.24.1.1/docs/reference/addressbook/libedata-book/html/EDataBookView.html	2008-11-07 07:55:28.000000000 +0100
@@ -4,13 +4,13 @@
 EDataBookView
-
-
+
+
-
+
@@ -19,7 +19,7 @@
 
-
+
-
diff -Nru evolution-data-server-2.24.1/docs/reference/addressbook/libedata-book/html/index.html evolution-data-server-2.24.1.1/docs/reference/addressbook/libedata-book/html/index.html
--- evolution-data-server-2.24.1/docs/reference/addressbook/libedata-book/html/index.html	2008-10-20 10:11:19.000000000 +0200
+++ evolution-data-server-2.24.1.1/docs/reference/addressbook/libedata-book/html/index.html	2008-11-07 07:55:28.000000000 +0100
@@ -2,23 +2,23 @@
 
-Evolution API Reference: libedata-book, the Addressbook backend library
+Evolution-Data-Server Manual: Address Book Backend (libedata-book)
-
-
+
+
-
+

 

-

 

 
Returns :
 An ESource.
+ An ESource.
 
 

 
 
 
 

 
contact :
 the modified EContact
+ the modified EContact
 
 

 
 
 
 
 
 
 
 
 
 
Prev
 Up
 HomeEvolution API Reference: libedata-book, the Addressbook backend libraryEvolution-Data-Server Manual: Address Book Backend (libedata-book)
 Next
 

 

@@ -59,7 +59,9 @@
                                                         (EDataBookView *book_view);
 GMutex*             e_data_book_view_get_mutex          (EDataBookView *book_view);
 void                e_data_book_view_notify_update      (EDataBookView *book_view,
-                                                         EContact *contact);
+                                                         EContact *contact);
 void                e_data_book_view_notify_update_vcard
                                                         (EDataBookView *book_view,
                                                          char *vcard);
@@ -333,7 +335,9 @@
 

 
e_data_book_view_notify_update ()

 
void                e_data_book_view_notify_update      (EDataBookView *book_view,
-                                                         EContact *contact);

+                                                         EContact *contact);
 

 Notify listeners that contact has changed. This can
 trigger an add, change or removal event depending on
@@ -352,7 +356,9 @@
 

 

 
contact :
 an EContact
+ an EContact
 
 

 
 
 
 
 
 
 
 
 
 

+

 

 

 

-
Evolution API Reference: libedata-book, the Addressbook backend library

+
Evolution-Data-Server Manual: Address Book Backend (libedata-book)

 

 

 EBookBackend
diff -Nru evolution-data-server-2.24.1/docs/reference/addressbook/libedata-book/html/ix01.html evolution-data-server-2.24.1.1/docs/reference/addressbook/libedata-book/html/ix01.html
--- evolution-data-server-2.24.1/docs/reference/addressbook/libedata-book/html/ix01.html	2008-10-20 10:11:19.000000000 +0200
+++ evolution-data-server-2.24.1.1/docs/reference/addressbook/libedata-book/html/ix01.html	2008-11-07 07:55:28.000000000 +0100
@@ -4,12 +4,12 @@
 
 Index
 
-
-
+
+
 
 
 
-
+
 
 
 
@@ -17,7 +17,7 @@
 Prev
  
 Home
-Evolution API Reference: libedata-book, the Addressbook backend library
+Evolution-Data-Server Manual: Address Book Backend (libedata-book)
  
 
 

diff -Nru evolution-data-server-2.24.1/docs/reference/addressbook/libedata-book/html/libedata-book.devhelp evolution-data-server-2.24.1.1/docs/reference/addressbook/libedata-book/html/libedata-book.devhelp
--- evolution-data-server-2.24.1/docs/reference/addressbook/libedata-book/html/libedata-book.devhelp	2008-10-20 10:11:19.000000000 +0200
+++ evolution-data-server-2.24.1.1/docs/reference/addressbook/libedata-book/html/libedata-book.devhelp	2008-11-07 07:55:28.000000000 +0100
@@ -1,8 +1,8 @@
 
 
-
+
   
-    
+    
       
       
       
diff -Nru evolution-data-server-2.24.1/docs/reference/addressbook/libedata-book/html/libedata-book.devhelp2 evolution-data-server-2.24.1.1/docs/reference/addressbook/libedata-book/html/libedata-book.devhelp2
--- evolution-data-server-2.24.1/docs/reference/addressbook/libedata-book/html/libedata-book.devhelp2	2008-10-20 10:11:19.000000000 +0200
+++ evolution-data-server-2.24.1.1/docs/reference/addressbook/libedata-book/html/libedata-book.devhelp2	2008-11-07 07:55:28.000000000 +0100
@@ -1,8 +1,8 @@
 
 
-
+
   
-    
+    
       
       
       
diff -Nru evolution-data-server-2.24.1/docs/reference/addressbook/libedata-book/html/libedata-book-e-book-backend-db-cache.html evolution-data-server-2.24.1.1/docs/reference/addressbook/libedata-book/html/libedata-book-e-book-backend-db-cache.html
--- evolution-data-server-2.24.1/docs/reference/addressbook/libedata-book/html/libedata-book-e-book-backend-db-cache.html	2008-10-20 10:11:19.000000000 +0200
+++ evolution-data-server-2.24.1.1/docs/reference/addressbook/libedata-book/html/libedata-book-e-book-backend-db-cache.html	2008-11-07 07:55:28.000000000 +0100
@@ -4,13 +4,13 @@
 
 e-book-backend-db-cache
 
-
-
+
+
 
 
 
 
-
+
 
 
 
@@ -19,7 +19,7 @@
 Prev
 Up
 Home
-Evolution API Reference: libedata-book, the Addressbook backend library
+Evolution-Data-Server Manual: Address Book Backend (libedata-book)
 Next
 
 
@@ -40,7 +40,9 @@
 

 
Synopsis

 
-EContact*           e_book_backend_db_cache_get_contact (DB *db,
+EContact*           e_book_backend_db_cache_get_contact (DB *db,
                                                          const char *uid);
 void                string_to_dbt                       (const char *str,
                                                          DBT *dbt);
@@ -50,7 +52,9 @@
                                                         (DB *db,
                                                          const char *filename);
 gboolean            e_book_backend_db_cache_add_contact (DB *db,
-                                                         EContact *contact);
+                                                         EContact *contact);
 gboolean            e_book_backend_db_cache_remove_contact
                                                         (DB *db,
                                                          const char *uid);
@@ -78,10 +82,14 @@
 
Details

 

 
e_book_backend_db_cache_get_contact ()

-
EContact*           e_book_backend_db_cache_get_contact (DB *db,
+
EContact*           e_book_backend_db_cache_get_contact (DB *db,
                                                          const char *uid);

 

-Get a cached contact. Note that the returned EContact will be
+Get a cached contact. Note that the returned EContact will be
 newly created, and must be unreffed by the caller when no longer
 needed.

 

@@ -101,7 +109,9 @@
 
 
 
Returns :

- A cached EContact, or NULL if uid is not cached.
+ A cached EContact, or NULL if uid is not cached.
 
 
 
@@ -185,7 +195,9 @@
 

 
e_book_backend_db_cache_add_contact ()

 
gboolean            e_book_backend_db_cache_add_contact (DB *db,
-                                                         EContact *contact);

+                                                         EContact *contact);

 

 Adds contact to cache.

 

@@ -200,7 +212,9 @@
 
 
 
contact :

- an EContact
+ an EContact
 
 
 
@@ -280,7 +294,9 @@
                                                         (DB *db,
                                                          const char *query);

 

-Returns a list of EContact elements from cache matching query.
+Returns a list of EContact elements from cache matching query.
 When done with the list, the caller must unref the contacts and
 free the list.

 

@@ -300,7 +316,9 @@
 
 
 
Returns :

- A GList of pointers to EContact.
+ A GList of pointers to EContact.
 
 
 
diff -Nru evolution-data-server-2.24.1/docs/reference/addressbook/libedata-book/html/libedata-book-EDataBookFactory.html evolution-data-server-2.24.1.1/docs/reference/addressbook/libedata-book/html/libedata-book-EDataBookFactory.html
--- evolution-data-server-2.24.1/docs/reference/addressbook/libedata-book/html/libedata-book-EDataBookFactory.html	2008-10-20 10:11:19.000000000 +0200
+++ evolution-data-server-2.24.1.1/docs/reference/addressbook/libedata-book/html/libedata-book-EDataBookFactory.html	2008-11-07 07:55:28.000000000 +0100
@@ -4,13 +4,13 @@
 
 EDataBookFactory
 
-
-
+
+
 
 
 
 
-
+
 
 
 
@@ -19,7 +19,7 @@
 Prev
 Up
 Home
-Evolution API Reference: libedata-book, the Addressbook backend library
+Evolution-Data-Server Manual: Address Book Backend (libedata-book)
 Next
 
 
diff -Nru evolution-data-server-2.24.1/docs/reference/addressbook/libedata-book/html/libedata-book-ximian-vcard.html evolution-data-server-2.24.1.1/docs/reference/addressbook/libedata-book/html/libedata-book-ximian-vcard.html
--- evolution-data-server-2.24.1/docs/reference/addressbook/libedata-book/html/libedata-book-ximian-vcard.html	2008-10-20 10:11:19.000000000 +0200
+++ evolution-data-server-2.24.1.1/docs/reference/addressbook/libedata-book/html/libedata-book-ximian-vcard.html	2008-11-07 07:55:28.000000000 +0100
@@ -4,13 +4,13 @@
 
 ximian-vcard
 
-
-
+
+
 
 
 
 
-
+
 
 
 
@@ -19,7 +19,7 @@
 Prev
 Up
 Home
-Evolution API Reference: libedata-book, the Addressbook backend library
+Evolution-Data-Server Manual: Address Book Backend (libedata-book)
 Next
 
 
diff -Nru evolution-data-server-2.24.1/docs/reference/addressbook/libedata-book/libedata-book-docs.sgml evolution-data-server-2.24.1.1/docs/reference/addressbook/libedata-book/libedata-book-docs.sgml
--- evolution-data-server-2.24.1/docs/reference/addressbook/libedata-book/libedata-book-docs.sgml	2008-10-13 10:07:59.000000000 +0200
+++ evolution-data-server-2.24.1.1/docs/reference/addressbook/libedata-book/libedata-book-docs.sgml	2008-11-07 05:34:23.000000000 +0100
@@ -3,11 +3,11 @@
                "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd">
 
   
-    Evolution API Reference: libedata-book, the Addressbook backend library
+    Evolution-Data-Server Manual: Address Book Backend (libedata-book)
   
 
   
-    Evolution API Reference: libedata-book, the Addressbook backend library
+    Evolution-Data-Server Manual: Address Book Backend (libedata-book)
     
     
     
diff -Nru evolution-data-server-2.24.1/docs/reference/addressbook/libedata-book/tmpl/libedata-book-unused.sgml evolution-data-server-2.24.1.1/docs/reference/addressbook/libedata-book/tmpl/libedata-book-unused.sgml
--- evolution-data-server-2.24.1/docs/reference/addressbook/libedata-book/tmpl/libedata-book-unused.sgml	2008-10-20 10:11:19.000000000 +0200
+++ evolution-data-server-2.24.1.1/docs/reference/addressbook/libedata-book/tmpl/libedata-book-unused.sgml	2008-11-07 07:55:28.000000000 +0100
@@ -182,3 +182,17 @@
 
 
 
+
+
+
+
+
+@book_view: 
+
+
+
+
+
+
+@book_view: 
+
diff -Nru evolution-data-server-2.24.1/docs/reference/calendar/libecal/html/ch01.html evolution-data-server-2.24.1.1/docs/reference/calendar/libecal/html/ch01.html
--- evolution-data-server-2.24.1/docs/reference/calendar/libecal/html/ch01.html	2008-10-20 10:11:20.000000000 +0200
+++ evolution-data-server-2.24.1.1/docs/reference/calendar/libecal/html/ch01.html	2008-11-07 07:55:28.000000000 +0100
@@ -2,15 +2,15 @@
 
 
 
-Evolution API Reference: libecal, the Calendar Library
+Evolution-Data-Server Manual: Calendar Client (libecal)
 
-
-
-
+
+
+
 
 
 
-
+
 
 
 
@@ -18,12 +18,12 @@
 Prev
  
 Home
-Evolution API Reference: libecal, the Calendar Library
+Evolution-Data-Server Manual: Calendar Client (libecal)
 Next
 
 

 

-Evolution API Reference: libecal, the Calendar Library

+Evolution-Data-Server Manual: Calendar Client (libecal)

 

 

 ECal — Permits access to a calendar or list of tasks.
diff -Nru evolution-data-server-2.24.1/docs/reference/calendar/libecal/html/ECalComponent.html evolution-data-server-2.24.1.1/docs/reference/calendar/libecal/html/ECalComponent.html
--- evolution-data-server-2.24.1/docs/reference/calendar/libecal/html/ECalComponent.html	2008-10-20 10:11:20.000000000 +0200
+++ evolution-data-server-2.24.1.1/docs/reference/calendar/libecal/html/ECalComponent.html	2008-11-07 07:55:28.000000000 +0100
@@ -4,13 +4,13 @@
 
 ECalComponent
 
-
-
+
+
 
 
 
 
-
+
 
 
 
@@ -19,7 +19,7 @@
 Prev
 Up
 Home
-Evolution API Reference: libecal, the Calendar Library
+Evolution-Data-Server Manual: Calendar Client (libecal)
 Next
 
 
diff -Nru evolution-data-server-2.24.1/docs/reference/calendar/libecal/html/ECal.html evolution-data-server-2.24.1.1/docs/reference/calendar/libecal/html/ECal.html
--- evolution-data-server-2.24.1/docs/reference/calendar/libecal/html/ECal.html	2008-10-20 10:11:20.000000000 +0200
+++ evolution-data-server-2.24.1.1/docs/reference/calendar/libecal/html/ECal.html	2008-11-07 07:55:28.000000000 +0100
@@ -4,13 +4,13 @@
 
 ECal
 
-
-
-
+
+
+
 
 
 
-
+
 
 
 
@@ -19,7 +19,7 @@
 Prev
 Up
 Home
-Evolution API Reference: libecal, the Calendar Library
+Evolution-Data-Server Manual: Calendar Client (libecal)
 Next
 
 
@@ -58,7 +58,9 @@
 GType               e_cal_source_type_enum_get_type     (void);
 GType               e_cal_set_mode_status_enum_get_type (void);
 GType               cal_mode_enum_get_type              (void);
-ECal *              e_cal_new                           (ESource *source,
+ECal *              e_cal_new                           (ESource *source,
                                                          ECalSourceType type);
 ECal *              e_cal_new_from_uri                  (const gchar *uri,
                                                          ECalSourceType type);
@@ -79,7 +81,9 @@
                                                          CalMode mode);
 ECalSourceType      e_cal_get_source_type               (ECal *ecal);
 ECalLoadState       e_cal_get_load_state                (ECal *ecal);
-ESource *           e_cal_get_source                    (ECal *ecal);
+ESource *           e_cal_get_source                    (ECal *ecal);
 const char *        e_cal_get_uri                       (ECal *ecal);
 gboolean            e_cal_is_read_only                  (ECal *ecal,
                                                          gboolean *read_only,
@@ -207,10 +211,14 @@
                                                          GError **error);
 gboolean            e_cal_set_default                   (ECal *ecal,
                                                          GError **error);
-gboolean            e_cal_set_default_source            (ESource *source,
+gboolean            e_cal_set_default_source            (ESource *source,
                                                          ECalSourceType type,
                                                          GError **error);
-gboolean            e_cal_get_sources                   (ESourceList **sources,
+gboolean            e_cal_get_sources                   (ESourceList **sources,
                                                          ECalSourceType type,
                                                          GError **error);
 const char *        e_cal_get_local_attachment_store    (ECal *ecal);
@@ -415,7 +423,9 @@
 

 

 
e_cal_new ()

-
ECal *              e_cal_new                           (ESource *source,
+
ECal *              e_cal_new                           (ESource *source,
                                                          ECalSourceType type);

 

 Creates a new calendar client. This does not open the calendar itself,
@@ -427,7 +437,9 @@
 
 
 
source :

- An ESource to be used for the client.
+ An ESource to be used for the client.
 
 
 
@@ -775,7 +787,9 @@
 

 

 
e_cal_get_source ()

-
ESource *           e_cal_get_source                    (ECal *ecal);

+
ESource *           e_cal_get_source                    (ECal *ecal);

 

 Queries the source that is open in a calendar client.

 

@@ -2341,7 +2355,9 @@
 

 

 
e_cal_set_default_source ()

-
gboolean            e_cal_set_default_source            (ESource *source,
+
gboolean            e_cal_set_default_source            (ESource *source,
                                                          ECalSourceType type,
                                                          GError **error);

 

@@ -2353,7 +2369,9 @@
 
 
 
source :

- An ESource.
+ An ESource.
 
 
 
@@ -2377,7 +2395,9 @@
 

 

 
e_cal_get_sources ()

-
gboolean            e_cal_get_sources                   (ESourceList **sources,
+
gboolean            e_cal_get_sources                   (ESourceList **sources,
                                                          ECalSourceType type,
                                                          GError **error);

 

diff -Nru evolution-data-server-2.24.1/docs/reference/calendar/libecal/html/ECalListener.html evolution-data-server-2.24.1.1/docs/reference/calendar/libecal/html/ECalListener.html
--- evolution-data-server-2.24.1/docs/reference/calendar/libecal/html/ECalListener.html	2008-10-20 10:11:20.000000000 +0200
+++ evolution-data-server-2.24.1.1/docs/reference/calendar/libecal/html/ECalListener.html	2008-11-07 07:55:28.000000000 +0100
@@ -4,13 +4,13 @@
 
 ECalListener
 
-
-
+
+
 
 
 
 
-
+
 
 
 
@@ -19,7 +19,7 @@
 Prev
 Up
 Home
-Evolution API Reference: libecal, the Calendar Library
+Evolution-Data-Server Manual: Calendar Client (libecal)
 Next
 
 
diff -Nru evolution-data-server-2.24.1/docs/reference/calendar/libecal/html/ECalView.html evolution-data-server-2.24.1.1/docs/reference/calendar/libecal/html/ECalView.html
--- evolution-data-server-2.24.1/docs/reference/calendar/libecal/html/ECalView.html	2008-10-20 10:11:20.000000000 +0200
+++ evolution-data-server-2.24.1.1/docs/reference/calendar/libecal/html/ECalView.html	2008-11-07 07:55:28.000000000 +0100
@@ -4,13 +4,13 @@
 
 ECalView
 
-
-
+
+
 
 
 
 
-
+
 
 
 
@@ -19,7 +19,7 @@
 Prev
 Up
 Home
-Evolution API Reference: libecal, the Calendar Library
+Evolution-Data-Server Manual: Calendar Client (libecal)
 Next
 
 
diff -Nru evolution-data-server-2.24.1/docs/reference/calendar/libecal/html/ECalViewListener.html evolution-data-server-2.24.1.1/docs/reference/calendar/libecal/html/ECalViewListener.html
--- evolution-data-server-2.24.1/docs/reference/calendar/libecal/html/ECalViewListener.html	2008-10-20 10:11:20.000000000 +0200
+++ evolution-data-server-2.24.1.1/docs/reference/calendar/libecal/html/ECalViewListener.html	2008-11-07 07:55:28.000000000 +0100
@@ -4,13 +4,13 @@
 
 ECalViewListener
 
-
-
+
+
 
 
 
 
-
+
 
 
 
@@ -19,7 +19,7 @@
 Prev
 Up
 Home
-Evolution API Reference: libecal, the Calendar Library
+Evolution-Data-Server Manual: Calendar Client (libecal)
 Next
 
 
diff -Nru evolution-data-server-2.24.1/docs/reference/calendar/libecal/html/index.html evolution-data-server-2.24.1.1/docs/reference/calendar/libecal/html/index.html
--- evolution-data-server-2.24.1/docs/reference/calendar/libecal/html/index.html	2008-10-20 10:11:20.000000000 +0200
+++ evolution-data-server-2.24.1.1/docs/reference/calendar/libecal/html/index.html	2008-11-07 07:55:28.000000000 +0100
@@ -2,23 +2,23 @@
 
 
 
-Evolution API Reference: libecal, the Calendar Library
+Evolution-Data-Server Manual: Calendar Client (libecal)
 
-
-
+
+
 
 
-
+
 
 
 
 

 

-

+

 

 

 

-
Evolution API Reference: libecal, the Calendar Library

+
Evolution-Data-Server Manual: Calendar Client (libecal)

 

 

 ECal — Permits access to a calendar or list of tasks.
diff -Nru evolution-data-server-2.24.1/docs/reference/calendar/libecal/html/ix01.html evolution-data-server-2.24.1.1/docs/reference/calendar/libecal/html/ix01.html
--- evolution-data-server-2.24.1/docs/reference/calendar/libecal/html/ix01.html	2008-10-20 10:11:20.000000000 +0200
+++ evolution-data-server-2.24.1.1/docs/reference/calendar/libecal/html/ix01.html	2008-11-07 07:55:28.000000000 +0100
@@ -4,12 +4,12 @@
 
 Index
 
-
-
+
+
 
 
 
-
+
 
 
 
@@ -17,7 +17,7 @@
 Prev
  
 Home
-Evolution API Reference: libecal, the Calendar Library
+Evolution-Data-Server Manual: Calendar Client (libecal)
  
 
 

diff -Nru evolution-data-server-2.24.1/docs/reference/calendar/libecal/html/libecal.devhelp evolution-data-server-2.24.1.1/docs/reference/calendar/libecal/html/libecal.devhelp
--- evolution-data-server-2.24.1/docs/reference/calendar/libecal/html/libecal.devhelp	2008-10-20 10:11:20.000000000 +0200
+++ evolution-data-server-2.24.1.1/docs/reference/calendar/libecal/html/libecal.devhelp	2008-11-07 07:55:28.000000000 +0100
@@ -1,8 +1,8 @@
 
 
-
+
   
-    
+    
       
       
       
diff -Nru evolution-data-server-2.24.1/docs/reference/calendar/libecal/html/libecal.devhelp2 evolution-data-server-2.24.1.1/docs/reference/calendar/libecal/html/libecal.devhelp2
--- evolution-data-server-2.24.1/docs/reference/calendar/libecal/html/libecal.devhelp2	2008-10-20 10:11:20.000000000 +0200
+++ evolution-data-server-2.24.1.1/docs/reference/calendar/libecal/html/libecal.devhelp2	2008-11-07 07:55:28.000000000 +0100
@@ -1,8 +1,8 @@
 
 
-
+
   
-    
+    
       
       
       
diff -Nru evolution-data-server-2.24.1/docs/reference/calendar/libecal/html/libecal-e-cal-check-timezones.html evolution-data-server-2.24.1.1/docs/reference/calendar/libecal/html/libecal-e-cal-check-timezones.html
--- evolution-data-server-2.24.1/docs/reference/calendar/libecal/html/libecal-e-cal-check-timezones.html	2008-10-20 10:11:20.000000000 +0200
+++ evolution-data-server-2.24.1.1/docs/reference/calendar/libecal/html/libecal-e-cal-check-timezones.html	2008-11-07 07:55:28.000000000 +0100
@@ -4,13 +4,13 @@
 
 e-cal-check-timezones
 
-
-
+
+
 
 
 
 
-
+
 
 
 
@@ -19,7 +19,7 @@
 Prev
 Up
 Home
-Evolution API Reference: libecal, the Calendar Library
+Evolution-Data-Server Manual: Calendar Client (libecal)
 Next
 
 
diff -Nru evolution-data-server-2.24.1/docs/reference/calendar/libecal/html/libecal-e-cal-recur.html evolution-data-server-2.24.1.1/docs/reference/calendar/libecal/html/libecal-e-cal-recur.html
--- evolution-data-server-2.24.1/docs/reference/calendar/libecal/html/libecal-e-cal-recur.html	2008-10-20 10:11:20.000000000 +0200
+++ evolution-data-server-2.24.1.1/docs/reference/calendar/libecal/html/libecal-e-cal-recur.html	2008-11-07 07:55:28.000000000 +0100
@@ -4,13 +4,13 @@
 
 e-cal-recur
 
-
-
+
+
 
 
 
 
-
+
 
 
 
@@ -19,7 +19,7 @@
 Prev
 Up
 Home
-Evolution API Reference: libecal, the Calendar Library
+Evolution-Data-Server Manual: Calendar Client (libecal)
 Next
 
 
diff -Nru evolution-data-server-2.24.1/docs/reference/calendar/libecal/html/libecal-e-cal-time-util.html evolution-data-server-2.24.1.1/docs/reference/calendar/libecal/html/libecal-e-cal-time-util.html
--- evolution-data-server-2.24.1/docs/reference/calendar/libecal/html/libecal-e-cal-time-util.html	2008-10-20 10:11:20.000000000 +0200
+++ evolution-data-server-2.24.1.1/docs/reference/calendar/libecal/html/libecal-e-cal-time-util.html	2008-11-07 07:55:28.000000000 +0100
@@ -4,13 +4,13 @@
 
 e-cal-time-util
 
-
-
+
+
 
 
 
 
-
+
 
 
 
@@ -19,7 +19,7 @@
 Prev
 Up
 Home
-Evolution API Reference: libecal, the Calendar Library
+Evolution-Data-Server Manual: Calendar Client (libecal)
 Next
 
 
@@ -81,8 +81,12 @@
 void                time_to_gdate_with_zone             (GDate *date,
                                                          time_t time,
                                                          icaltimezone *zone);
-struct tm           icaltimetype_to_tm                  (struct icaltimetype *itt);
-struct tm           icaltimetype_to_tm_with_zone        (struct icaltimetype *itt,
+struct tm           icaltimetype_to_tm                  (struct icaltimetype *itt);
+struct tm           icaltimetype_to_tm_with_zone        (struct icaltimetype *itt,
                                                          icaltimezone *from_zone,
                                                          icaltimezone *to_zone);
 struct icaltimetype  tm_to_icaltimetype                 (struct tm *tm,
@@ -754,7 +758,9 @@
 

 

 
icaltimetype_to_tm ()

-
struct tm           icaltimetype_to_tm                  (struct icaltimetype *itt);

+
struct tm           icaltimetype_to_tm                  (struct icaltimetype *itt);

 

 Convers an icaltimetype structure into a GLibc's struct tm.

 

@@ -779,7 +785,9 @@
 

 

 
icaltimetype_to_tm_with_zone ()

-
struct tm           icaltimetype_to_tm_with_zone        (struct icaltimetype *itt,
+
struct tm           icaltimetype_to_tm_with_zone        (struct icaltimetype *itt,
                                                          icaltimezone *from_zone,
                                                          icaltimezone *to_zone);

 

diff -Nru evolution-data-server-2.24.1/docs/reference/calendar/libecal/html/libecal-e-cal-types.html evolution-data-server-2.24.1.1/docs/reference/calendar/libecal/html/libecal-e-cal-types.html
--- evolution-data-server-2.24.1/docs/reference/calendar/libecal/html/libecal-e-cal-types.html	2008-10-20 10:11:20.000000000 +0200
+++ evolution-data-server-2.24.1.1/docs/reference/calendar/libecal/html/libecal-e-cal-types.html	2008-11-07 07:55:28.000000000 +0100
@@ -4,13 +4,13 @@
 
 e-cal-types
 
-
-
+
+
 
 
 
 
-
+
 
 
 
@@ -19,7 +19,7 @@
 Prev
 Up
 Home
-Evolution API Reference: libecal, the Calendar Library
+Evolution-Data-Server Manual: Calendar Client (libecal)
 Next
 
 
diff -Nru evolution-data-server-2.24.1/docs/reference/calendar/libecal/html/libecal-e-cal-util.html evolution-data-server-2.24.1.1/docs/reference/calendar/libecal/html/libecal-e-cal-util.html
--- evolution-data-server-2.24.1/docs/reference/calendar/libecal/html/libecal-e-cal-util.html	2008-10-20 10:11:20.000000000 +0200
+++ evolution-data-server-2.24.1.1/docs/reference/calendar/libecal/html/libecal-e-cal-util.html	2008-11-07 07:55:28.000000000 +0100
@@ -4,13 +4,13 @@
 
 e-cal-util
 
-
-
+
+
 
 
 
 
-
+
 
 
 
@@ -19,7 +19,7 @@
 Prev
 Up
 Home
-Evolution API Reference: libecal, the Calendar Library
+Evolution-Data-Server Manual: Calendar Client (libecal)
 Next
 
 
diff -Nru evolution-data-server-2.24.1/docs/reference/calendar/libecal/libecal-docs.sgml evolution-data-server-2.24.1.1/docs/reference/calendar/libecal/libecal-docs.sgml
--- evolution-data-server-2.24.1/docs/reference/calendar/libecal/libecal-docs.sgml	2008-10-13 10:08:05.000000000 +0200
+++ evolution-data-server-2.24.1.1/docs/reference/calendar/libecal/libecal-docs.sgml	2008-11-07 05:34:23.000000000 +0100
@@ -3,11 +3,11 @@
                "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd">
 
   
-    Evolution API Reference: libecal, the Calendar Library
+    Evolution-Data-Server Manual: Calendar Client (libecal)
   
 
   
-    Evolution API Reference: libecal, the Calendar Library
+    Evolution-Data-Server Manual: Calendar Client (libecal)
     
     
     
diff -Nru evolution-data-server-2.24.1/docs/reference/calendar/libedata-cal/html/ch01.html evolution-data-server-2.24.1.1/docs/reference/calendar/libedata-cal/html/ch01.html
--- evolution-data-server-2.24.1/docs/reference/calendar/libedata-cal/html/ch01.html	2008-10-20 10:11:20.000000000 +0200
+++ evolution-data-server-2.24.1.1/docs/reference/calendar/libedata-cal/html/ch01.html	2008-11-07 07:55:28.000000000 +0100
@@ -2,15 +2,15 @@
 
 
 
-Evolution API Reference: libedata-cal, the Calendar Backend Library
+Evolution-Data-Server Manual: Calendar Backend (libedata-cal)
 
-
-
-
+
+
+
 
 
 
-
+
 
 
 
@@ -18,12 +18,12 @@
 Prev
  
 Home
-Evolution API Reference: libedata-cal, the Calendar Backend Library
+Evolution-Data-Server Manual: Calendar Backend (libedata-cal)
 Next
 
 

 

-Evolution API Reference: libedata-cal, the Calendar Backend Library

+Evolution-Data-Server Manual: Calendar Backend (libedata-cal)

 

 

 ECalBackend — Base class for calendar/tasks backend implementations.
diff -Nru evolution-data-server-2.24.1/docs/reference/calendar/libedata-cal/html/ECalBackendCache.html evolution-data-server-2.24.1.1/docs/reference/calendar/libedata-cal/html/ECalBackendCache.html
--- evolution-data-server-2.24.1/docs/reference/calendar/libedata-cal/html/ECalBackendCache.html	2008-10-20 10:11:20.000000000 +0200
+++ evolution-data-server-2.24.1.1/docs/reference/calendar/libedata-cal/html/ECalBackendCache.html	2008-11-07 07:55:28.000000000 +0100
@@ -4,13 +4,13 @@
 
 ECalBackendCache
 
-
-
+
+
 
 
 
 
-
+
 
 
 
@@ -19,7 +19,7 @@
 Prev
 Up
 Home
-Evolution API Reference: libedata-cal, the Calendar Backend Library
+Evolution-Data-Server Manual: Calendar Backend (libedata-cal)
 Next
 
 
@@ -46,12 +46,18 @@
 
                     ECalBackendCache;
 ECalBackendCache *  e_cal_backend_cache_new             (const char *uri,
-                                                         ECalSourceType source_type);
-ECalComponent *     e_cal_backend_cache_get_component   (ECalBackendCache *cache,
+                                                         ECalSourceType source_type);
+ECalComponent *     e_cal_backend_cache_get_component   (ECalBackendCache *cache,
                                                          const char *uid,
                                                          const char *rid);
 gboolean            e_cal_backend_cache_put_component   (ECalBackendCache *cache,
-                                                         ECalComponent *comp);
+                                                         ECalComponent *comp);
 gboolean            e_cal_backend_cache_remove_component
                                                         (ECalBackendCache *cache,
                                                          const char *uid,
@@ -90,7 +96,9 @@
 
Object Hierarchy

 
   GObject
-   +----EFileCache
+   +----EFileCache
          +----ECalBackendCache
 

 

@@ -118,7 +126,9 @@
 

 
e_cal_backend_cache_new ()

 
ECalBackendCache *  e_cal_backend_cache_new             (const char *uri,
-                                                         ECalSourceType source_type);

+                                                         ECalSourceType source_type);

 

 Creates a new ECalBackendCache object, which implements a cache of
 calendar/tasks objects, very useful for remote backends.

@@ -148,7 +158,9 @@
 

 

 
e_cal_backend_cache_get_component ()

-
ECalComponent *     e_cal_backend_cache_get_component   (ECalBackendCache *cache,
+
ECalComponent *     e_cal_backend_cache_get_component   (ECalBackendCache *cache,
                                                          const char *uid,
                                                          const char *rid);

 

@@ -176,7 +188,9 @@
 
 
 
Returns :

- The ECalComponent representing the component found,
+ The ECalComponent representing the component found,
 or NULL if it was not found in the cache.
 
 
@@ -187,7 +201,9 @@
 

 
e_cal_backend_cache_put_component ()

 
gboolean            e_cal_backend_cache_put_component   (ECalBackendCache *cache,
-                                                         ECalComponent *comp);

+                                                         ECalComponent *comp);

 

 Puts the given calendar component in the given cache. This will add
 the component if it does not exist or replace it if there was a
@@ -272,7 +288,9 @@
 
 
Returns :

  A list of all the components. Each item in the list is
-an ECalComponent, which should be freed when no longer needed.
+an ECalComponent, which should be freed when no longer needed.
 
 
 
diff -Nru evolution-data-server-2.24.1/docs/reference/calendar/libedata-cal/html/ECalBackendFactory.html evolution-data-server-2.24.1.1/docs/reference/calendar/libedata-cal/html/ECalBackendFactory.html
--- evolution-data-server-2.24.1/docs/reference/calendar/libedata-cal/html/ECalBackendFactory.html	2008-10-20 10:11:20.000000000 +0200
+++ evolution-data-server-2.24.1.1/docs/reference/calendar/libedata-cal/html/ECalBackendFactory.html	2008-11-07 07:55:28.000000000 +0100
@@ -4,13 +4,13 @@
 
 ECalBackendFactory
 
-
-
+
+
 
 
 
 
-
+
 
 
 
@@ -19,7 +19,7 @@
 Prev
 Up
 Home
-Evolution API Reference: libedata-cal, the Calendar Backend Library
+Evolution-Data-Server Manual: Calendar Backend (libedata-cal)
 Next
 
 
@@ -46,7 +46,9 @@
 icalcomponent_kind  e_cal_backend_factory_get_kind      (ECalBackendFactory *factory);
 const char*         e_cal_backend_factory_get_protocol  (ECalBackendFactory *factory);
 ECalBackend*        e_cal_backend_factory_new_backend   (ECalBackendFactory *factory,
-                                                         ESource *source);
+                                                         ESource *source);
 

 

 

@@ -121,7 +123,9 @@
 

 
e_cal_backend_factory_new_backend ()

 
ECalBackend*        e_cal_backend_factory_new_backend   (ECalBackendFactory *factory,
-                                                         ESource *source);

+                                                         ESource *source);

 

 Creates a new backend for the given source.

 

@@ -136,7 +140,9 @@
 
 
 
source :

- An ESource.
+ An ESource.
 
 
 
diff -Nru evolution-data-server-2.24.1/docs/reference/calendar/libedata-cal/html/ECalBackend.html evolution-data-server-2.24.1.1/docs/reference/calendar/libedata-cal/html/ECalBackend.html
--- evolution-data-server-2.24.1/docs/reference/calendar/libedata-cal/html/ECalBackend.html	2008-10-20 10:11:20.000000000 +0200
+++ evolution-data-server-2.24.1.1/docs/reference/calendar/libedata-cal/html/ECalBackend.html	2008-11-07 07:55:28.000000000 +0100
@@ -4,13 +4,13 @@
 
 ECalBackend
 
-
-
-
+
+
+
 
 
 
-
+
 
 
 
@@ -19,7 +19,7 @@
 Prev
 Up
 Home
-Evolution API Reference: libedata-cal, the Calendar Backend Library
+Evolution-Data-Server Manual: Calendar Backend (libedata-cal)
 Next
 
 
@@ -40,7 +40,9 @@
 

 
Synopsis

 
-ESource *           e_cal_backend_get_source            (ECalBackend *backend);
+ESource *           e_cal_backend_get_source            (ECalBackend *backend);
 const char *        e_cal_backend_get_uri               (ECalBackend *backend);
 icalcomponent_kind  e_cal_backend_get_kind              (ECalBackend *backend);
 void                e_cal_backend_add_client            (ECalBackend *backend,
@@ -49,7 +51,9 @@
                                                          EDataCal *cal);
 void                e_cal_backend_add_query             (ECalBackend *backend,
                                                          EDataCalView *query);
-EList *             e_cal_backend_get_queries           (ECalBackend *backend);
+EList *             e_cal_backend_get_queries           (ECalBackend *backend);
 void                e_cal_backend_remove_query          (ECalBackend *backend,
                                                          EDataCalView *query);
 void                e_cal_backend_is_read_only          (ECalBackend *backend,
@@ -77,12 +81,16 @@
 void                e_cal_backend_modify_object         (ECalBackend *backend,
                                                          EDataCal *cal,
                                                          const char *calobj,
-                                                         CalObjModType mod);
+                                                         CalObjModType mod);
 void                e_cal_backend_remove_object         (ECalBackend *backend,
                                                          EDataCal *cal,
                                                          const char *uid,
                                                          const char *rid,
-                                                         CalObjModType mod);
+                                                         CalObjModType mod);
 void                e_cal_backend_discard_alarm         (ECalBackend *backend,
                                                          EDataCal *cal,
                                                          const char *uid,
@@ -109,9 +117,13 @@
 gboolean            e_cal_backend_is_loaded             (ECalBackend *backend);
 void                e_cal_backend_start_query           (ECalBackend *backend,
                                                          EDataCalView *query);
-CalMode             e_cal_backend_get_mode              (ECalBackend *backend);
+CalMode             e_cal_backend_get_mode              (ECalBackend *backend);
 void                e_cal_backend_set_mode              (ECalBackend *backend,
-                                                         CalMode mode);
+                                                         CalMode mode);
 void                e_cal_backend_get_timezone          (ECalBackend *backend,
                                                          EDataCal *cal,
                                                          const char *tzid);
@@ -146,7 +158,9 @@
                                                          const char *old_object,
                                                          const char *object);
 void                e_cal_backend_notify_object_removed (ECalBackend *backend,
-                                                         const ECalComponentId *id,
+                                                         const ECalComponentId *id,
                                                          const char *old_object,
                                                          const char *object);
 void                e_cal_backend_notify_mode           (ECalBackend *backend,
@@ -166,6 +180,17 @@
                                                          gboolean read_only);
 void                e_cal_backend_notify_cal_address    (ECalBackend *backend,
                                                          char *address);
+void                e_cal_backend_notify_objects_added  (ECalBackend *backend,
+                                                         EDataCalView *query,
+                                                         const GList *objects);
+void                e_cal_backend_notify_objects_modified
+                                                        (ECalBackend *backend,
+                                                         EDataCalView *query,
+                                                         const GList *objects);
+void                e_cal_backend_notify_objects_removed
+                                                        (ECalBackend *backend,
+                                                         EDataCalView *query,
+                                                         const GList *ids);
 

 

 

@@ -177,9 +202,13 @@
 
Details

 

 
e_cal_backend_get_source ()

-
ESource *           e_cal_backend_get_source            (ECalBackend *backend);

-

-Gets the ESource associated with the given backend.

+
ESource *           e_cal_backend_get_source            (ECalBackend *backend);

+

+Gets the ESource associated with the given backend.

 

 

 

@@ -192,7 +221,9 @@
 
-
@@ -328,7 +359,9 @@
 

 
e_cal_backend_get_queries ()

-
EList *             e_cal_backend_get_queries           (ECalBackend *backend);

+
EList *             e_cal_backend_get_queries           (ECalBackend *backend);

 

 Gets the list of live queries being run on the given backend.

 

@@ -606,7 +639,9 @@
 
void                e_cal_backend_modify_object         (ECalBackend *backend,
                                                          EDataCal *cal,
                                                          const char *calobj,
-                                                         CalObjModType mod);

+                                                         CalObjModType mod);
 

 Calls the modify_object method on the given backend.

 

@@ -644,7 +679,9 @@
                                                          EDataCal *cal,
                                                          const char *uid,
                                                          const char *rid,
-                                                         CalObjModType mod);
+                                                         CalObjModType mod);
 

 Removes an object in a calendar backend.  The backend will notify all of its
 clients about the change.

@@ -966,7 +1003,9 @@
 

 

 
e_cal_backend_get_mode ()

-
CalMode             e_cal_backend_get_mode              (ECalBackend *backend);

+
CalMode             e_cal_backend_get_mode              (ECalBackend *backend);

 

 Queries whether a calendar backend is connected remotely.

 

@@ -991,7 +1030,9 @@
 

 
e_cal_backend_set_mode ()

 
void                e_cal_backend_set_mode              (ECalBackend *backend,
-                                                         CalMode mode);

+                                                         CalMode mode);
 

 Sets the mode of the calendar

 

@@ -1363,7 +1404,9 @@
 

 
e_cal_backend_notify_object_removed ()

 
void                e_cal_backend_notify_object_removed (ECalBackend *backend,
-                                                         const ECalComponentId *id,
+                                                         const ECalComponentId *id,
                                                          const char *old_object,
                                                          const char *object);

 

@@ -1597,6 +1640,95 @@
 
 

 

 
Returns :
 The ESource for the backend.
+ The ESource for the backend.
 
 

 
 

 

+

+

+
e_cal_backend_notify_objects_added ()

+
void                e_cal_backend_notify_objects_added  (ECalBackend *backend,
+                                                         EDataCalView *query,
+                                                         const GList *objects);

+

+

+

++
+
+
+
+
+
+
+
+
+
+
+
+
+
+


backend :

+
query :

+
objects :

+

+

+

+

+
e_cal_backend_notify_objects_modified ()

+
void                e_cal_backend_notify_objects_modified
+                                                        (ECalBackend *backend,
+                                                         EDataCalView *query,
+                                                         const GList *objects);

+

+

+

++
+
+
+
+
+
+
+
+
+
+
+
+
+
+


backend :

+
query :

+
objects :

+

+

+

+

+
e_cal_backend_notify_objects_removed ()

+
void                e_cal_backend_notify_objects_removed
+                                                        (ECalBackend *backend,
+                                                         EDataCalView *query,
+                                                         const GList *ids);

+

+

+

++
+
+
+
+
+
+
+
+
+
+
+
+
+
+


backend :

+
query :

+
ids :

+

+

 

 

 

diff -Nru evolution-data-server-2.24.1/docs/reference/calendar/libedata-cal/html/ECalBackendSExp.html evolution-data-server-2.24.1.1/docs/reference/calendar/libedata-cal/html/ECalBackendSExp.html
--- evolution-data-server-2.24.1/docs/reference/calendar/libedata-cal/html/ECalBackendSExp.html	2008-10-20 10:11:20.000000000 +0200
+++ evolution-data-server-2.24.1.1/docs/reference/calendar/libedata-cal/html/ECalBackendSExp.html	2008-11-07 07:55:28.000000000 +0100
@@ -4,13 +4,13 @@
 
 ECalBackendSExp
 
-
-
+
+
 
 
 
 
-
+
 
 
 
@@ -19,7 +19,7 @@
 Prev
 Up
 Home
-Evolution API Reference: libedata-cal, the Calendar Backend Library
+Evolution-Data-Server Manual: Calendar Backend (libedata-cal)
 Next
 
 
@@ -46,30 +46,62 @@
                                                          const char *object,
                                                          ECalBackend *backend);
 gboolean            e_cal_backend_sexp_match_comp       (ECalBackendSExp *sexp,
-                                                         ECalComponent *comp,
+                                                         ECalComponent *comp,
                                                          ECalBackend *backend);
-ESExpResult *       e_cal_backend_sexp_func_time_now    (ESExp *esexp,
+ESExpResult *       e_cal_backend_sexp_func_time_now    (ESExp *esexp,
                                                          int argc,
-                                                         ESExpResult **argv,
+                                                         ESExpResult **argv,
                                                          void *data);
-ESExpResult *       e_cal_backend_sexp_func_make_time   (ESExp *esexp,
+ESExpResult *       e_cal_backend_sexp_func_make_time   (ESExp *esexp,
                                                          int argc,
-                                                         ESExpResult **argv,
+                                                         ESExpResult **argv,
                                                          void *data);
-ESExpResult *       e_cal_backend_sexp_func_time_add_day
-                                                        (ESExp *esexp,
+ESExpResult *       e_cal_backend_sexp_func_time_add_day
+                                                        (ESExp *esexp,
                                                          int argc,
-                                                         ESExpResult **argv,
+                                                         ESExpResult **argv,
                                                          void *data);
-ESExpResult *       e_cal_backend_sexp_func_time_day_begin
-                                                        (ESExp *esexp,
+ESExpResult *       e_cal_backend_sexp_func_time_day_begin
+                                                        (ESExp *esexp,
                                                          int argc,
-                                                         ESExpResult **argv,
+                                                         ESExpResult **argv,
                                                          void *data);
-ESExpResult *       e_cal_backend_sexp_func_time_day_end
-                                                        (ESExp *esexp,
+ESExpResult *       e_cal_backend_sexp_func_time_day_end
+                                                        (ESExp *esexp,
                                                          int argc,
-                                                         ESExpResult **argv,
+                                                         ESExpResult **argv,
                                                          void *data);
 

 

@@ -140,7 +172,9 @@
 
 
 
sexp :

- An ESExp object.
+ An ESExp object.
 
 
 
@@ -165,7 +199,9 @@
 

 
e_cal_backend_sexp_match_comp ()

 
gboolean            e_cal_backend_sexp_match_comp       (ECalBackendSExp *sexp,
-                                                         ECalComponent *comp,
+                                                         ECalComponent *comp,
                                                          ECalBackend *backend);

 

 Matches the given ECalComponent against the expression.

@@ -176,7 +212,9 @@
 
 
 
sexp :

- An ESExp object.
+ An ESExp object.
 
 
 
@@ -200,9 +238,15 @@
 

 

 
e_cal_backend_sexp_func_time_now ()

-
ESExpResult *       e_cal_backend_sexp_func_time_now    (ESExp *esexp,
+
ESExpResult *       e_cal_backend_sexp_func_time_now    (ESExp *esexp,
                                                          int argc,
-                                                         ESExpResult **argv,
+                                                         ESExpResult **argv,
                                                          void *data);

 

 Processes the (time-now) sexp expression.

@@ -213,7 +257,9 @@
 
 
 
esexp :

- An ESExp object.
+ An ESExp object.
 
 
 
@@ -242,9 +288,15 @@
 

 

 
e_cal_backend_sexp_func_make_time ()

-
ESExpResult *       e_cal_backend_sexp_func_make_time   (ESExp *esexp,
+
ESExpResult *       e_cal_backend_sexp_func_make_time   (ESExp *esexp,
                                                          int argc,
-                                                         ESExpResult **argv,
+                                                         ESExpResult **argv,
                                                          void *data);

 

 (make-time ISODATE)
@@ -259,7 +311,9 @@
 
 
 
esexp :

- An ESExp object.
+ An ESExp object.
 
 
 
@@ -288,10 +342,16 @@
 

 

 
e_cal_backend_sexp_func_time_add_day ()

-
ESExpResult *       e_cal_backend_sexp_func_time_add_day
-                                                        (ESExp *esexp,
+
ESExpResult *       e_cal_backend_sexp_func_time_add_day
+                                                        (ESExp *esexp,
                                                          int argc,
-                                                         ESExpResult **argv,
+                                                         ESExpResult **argv,
                                                          void *data);

 

 (time-add-day TIME N)
@@ -311,7 +371,9 @@
 
 
 
esexp :

- An ESExp object.
+ An ESExp object.
 
 
 
@@ -340,10 +402,16 @@
 

 

 
e_cal_backend_sexp_func_time_day_begin ()

-
ESExpResult *       e_cal_backend_sexp_func_time_day_begin
-                                                        (ESExp *esexp,
+
ESExpResult *       e_cal_backend_sexp_func_time_day_begin
+                                                        (ESExp *esexp,
                                                          int argc,
-                                                         ESExpResult **argv,
+                                                         ESExpResult **argv,
                                                          void *data);

 

 (time-day-begin TIME)
@@ -361,7 +429,9 @@
 
 
 
esexp :

- An ESExp object.
+ An ESExp object.
 
 
 
@@ -390,10 +460,16 @@
 

 

 
e_cal_backend_sexp_func_time_day_end ()

-
ESExpResult *       e_cal_backend_sexp_func_time_day_end
-                                                        (ESExp *esexp,
+
ESExpResult *       e_cal_backend_sexp_func_time_day_end
+                                                        (ESExp *esexp,
                                                          int argc,
-                                                         ESExpResult **argv,
+                                                         ESExpResult **argv,
                                                          void *data);

 

 (time-day-end TIME)
@@ -411,7 +487,9 @@
 
 
 
esexp :

- An ESExp object.
+ An ESExp object.
 
 
 
diff -Nru evolution-data-server-2.24.1/docs/reference/calendar/libedata-cal/html/ECalBackendSync.html evolution-data-server-2.24.1.1/docs/reference/calendar/libedata-cal/html/ECalBackendSync.html
--- evolution-data-server-2.24.1/docs/reference/calendar/libedata-cal/html/ECalBackendSync.html	2008-10-20 10:11:20.000000000 +0200
+++ evolution-data-server-2.24.1.1/docs/reference/calendar/libedata-cal/html/ECalBackendSync.html	2008-11-07 07:55:28.000000000 +0100
@@ -4,13 +4,13 @@
 
 ECalBackendSync
 
-
-
+
+
 
 
 
 
-
+
 
 
 
@@ -19,7 +19,7 @@
 Prev
 Up
 Home
-Evolution API Reference: libedata-cal, the Calendar Backend Library
+Evolution-Data-Server Manual: Calendar Backend (libedata-cal)
 Next
 
 
@@ -80,14 +80,18 @@
 ECalBackendSyncStatus  e_cal_backend_sync_modify_object (ECalBackendSync *backend,
                                                          EDataCal *cal,
                                                          const char *calobj,
-                                                         CalObjModType mod,
+                                                         CalObjModType mod,
                                                          char **old_object,
                                                          char **new_object);
 ECalBackendSyncStatus  e_cal_backend_sync_remove_object (ECalBackendSync *backend,
                                                          EDataCal *cal,
                                                          const char *uid,
                                                          const char *rid,
-                                                         CalObjModType mod,
+                                                         CalObjModType mod,
                                                          char **old_object,
                                                          char **object);
 ECalBackendSyncStatus  e_cal_backend_sync_get_attachment_list
@@ -535,7 +539,9 @@
 
ECalBackendSyncStatus  e_cal_backend_sync_modify_object (ECalBackendSync *backend,
                                                          EDataCal *cal,
                                                          const char *calobj,
-                                                         CalObjModType mod,
+                                                         CalObjModType mod,
                                                          char **old_object,
                                                          char **new_object);

 

@@ -592,7 +598,9 @@
                                                          EDataCal *cal,
                                                          const char *uid,
                                                          const char *rid,
-                                                         CalObjModType mod,
+                                                         CalObjModType mod,
                                                          char **old_object,
                                                          char **object);

 

diff -Nru evolution-data-server-2.24.1/docs/reference/calendar/libedata-cal/html/EDataCalFactory.html evolution-data-server-2.24.1.1/docs/reference/calendar/libedata-cal/html/EDataCalFactory.html
--- evolution-data-server-2.24.1/docs/reference/calendar/libedata-cal/html/EDataCalFactory.html	2008-10-20 10:11:20.000000000 +0200
+++ evolution-data-server-2.24.1.1/docs/reference/calendar/libedata-cal/html/EDataCalFactory.html	2008-11-07 07:55:28.000000000 +0100
@@ -4,13 +4,13 @@
 
 EDataCalFactory
 
-
-
+
+
 
 
 
 
-
+
 
 
 
@@ -19,7 +19,7 @@
 Prev
 Up
 Home
-Evolution API Reference: libedata-cal, the Calendar Backend Library
+Evolution-Data-Server Manual: Calendar Backend (libedata-cal)
 Next
 
 
diff -Nru evolution-data-server-2.24.1/docs/reference/calendar/libedata-cal/html/EDataCal.html evolution-data-server-2.24.1.1/docs/reference/calendar/libedata-cal/html/EDataCal.html
--- evolution-data-server-2.24.1/docs/reference/calendar/libedata-cal/html/EDataCal.html	2008-10-20 10:11:20.000000000 +0200
+++ evolution-data-server-2.24.1.1/docs/reference/calendar/libedata-cal/html/EDataCal.html	2008-11-07 07:55:28.000000000 +0100
@@ -4,13 +4,13 @@
 
 EDataCal
 
-
-
+
+
 
 
 
 
-
+
 
 
 
@@ -19,7 +19,7 @@
 Prev
 Up
 Home
-Evolution API Reference: libedata-cal, the Calendar Backend Library
+Evolution-Data-Server Manual: Calendar Backend (libedata-cal)
 Next
 
 
@@ -79,7 +79,9 @@
                                                          const char *object);
 void                e_data_cal_notify_object_removed    (EDataCal *cal,
                                                          GNOME_Evolution_Calendar_CallStatus status,
-                                                         const ECalComponentId *id,
+                                                         const ECalComponentId *id,
                                                          const char *old_object,
                                                          const char *object);
 void                e_data_cal_notify_alarm_discarded   (EDataCal *cal,
@@ -543,7 +545,9 @@
 
e_data_cal_notify_object_removed ()

 
void                e_data_cal_notify_object_removed    (EDataCal *cal,
                                                          GNOME_Evolution_Calendar_CallStatus status,
-                                                         const ECalComponentId *id,
+                                                         const ECalComponentId *id,
                                                          const char *old_object,
                                                          const char *object);

 

diff -Nru evolution-data-server-2.24.1/docs/reference/calendar/libedata-cal/html/EDataCalView.html evolution-data-server-2.24.1.1/docs/reference/calendar/libedata-cal/html/EDataCalView.html
--- evolution-data-server-2.24.1/docs/reference/calendar/libedata-cal/html/EDataCalView.html	2008-10-20 10:11:20.000000000 +0200
+++ evolution-data-server-2.24.1.1/docs/reference/calendar/libedata-cal/html/EDataCalView.html	2008-11-07 07:55:28.000000000 +0100
@@ -4,13 +4,13 @@
 
 EDataCalView
 
-
-
+
+
 
 
 
 
-
+
 
 
 
@@ -19,7 +19,7 @@
 Prev
 Up
 Home
-Evolution API Reference: libedata-cal, the Calendar Backend Library
+Evolution-Data-Server Manual: Calendar Backend (libedata-cal)
 Next
 
 
@@ -73,7 +73,9 @@
                                                          const GList *ids);
 void                e_data_cal_view_notify_objects_removed_1
                                                         (EDataCalView *query,
-                                                         const ECalComponentId *id);
+                                                         const ECalComponentId *id);
 void                e_data_cal_view_notify_progress     (EDataCalView *query,
                                                          const char *message,
                                                          int percent);
@@ -497,7 +499,9 @@
 
e_data_cal_view_notify_objects_removed_1 ()

 
void                e_data_cal_view_notify_objects_removed_1
                                                         (EDataCalView *query,
-                                                         const ECalComponentId *id);

+                                                         const ECalComponentId *id);

 

 

 

diff -Nru evolution-data-server-2.24.1/docs/reference/calendar/libedata-cal/html/index.html evolution-data-server-2.24.1.1/docs/reference/calendar/libedata-cal/html/index.html
--- evolution-data-server-2.24.1/docs/reference/calendar/libedata-cal/html/index.html	2008-10-20 10:11:20.000000000 +0200
+++ evolution-data-server-2.24.1.1/docs/reference/calendar/libedata-cal/html/index.html	2008-11-07 07:55:28.000000000 +0100
@@ -2,23 +2,23 @@
 
-Evolution API Reference: libedata-cal, the Calendar Backend Library
+Evolution-Data-Server Manual: Calendar Backend (libedata-cal)
-
-
+
+
-
+

 

-

 
 
 
 
 
 
 
 
 

+

 

 

 

-
Evolution API Reference: libedata-cal, the Calendar Backend Library

+
Evolution-Data-Server Manual: Calendar Backend (libedata-cal)

 

 

 ECalBackend — Base class for calendar/tasks backend implementations.
diff -Nru evolution-data-server-2.24.1/docs/reference/calendar/libedata-cal/html/index.sgml evolution-data-server-2.24.1.1/docs/reference/calendar/libedata-cal/html/index.sgml
--- evolution-data-server-2.24.1/docs/reference/calendar/libedata-cal/html/index.sgml	2008-10-20 10:11:20.000000000 +0200
+++ evolution-data-server-2.24.1.1/docs/reference/calendar/libedata-cal/html/index.sgml	2008-11-07 07:55:28.000000000 +0100
@@ -51,6 +51,9 @@
 
 
 
+
+
+
 
 
 
diff -Nru evolution-data-server-2.24.1/docs/reference/calendar/libedata-cal/html/ix01.html evolution-data-server-2.24.1.1/docs/reference/calendar/libedata-cal/html/ix01.html
--- evolution-data-server-2.24.1/docs/reference/calendar/libedata-cal/html/ix01.html	2008-10-20 10:11:20.000000000 +0200
+++ evolution-data-server-2.24.1.1/docs/reference/calendar/libedata-cal/html/ix01.html	2008-11-07 07:55:28.000000000 +0100
@@ -4,12 +4,12 @@
 
 Index
 
-
-
+
+
 
 
 
-
+
 
 
 
@@ -17,7 +17,7 @@
 Prev
  
 Home
-Evolution API Reference: libedata-cal, the Calendar Backend Library
+Evolution-Data-Server Manual: Calendar Backend (libedata-cal)
  
 
 

@@ -151,6 +151,12 @@
 

 
e_cal_backend_notify_mode, e_cal_backend_notify_mode ()
 

+
e_cal_backend_notify_objects_added, e_cal_backend_notify_objects_added ()
+

+
e_cal_backend_notify_objects_modified, e_cal_backend_notify_objects_modified ()
+

+
e_cal_backend_notify_objects_removed, e_cal_backend_notify_objects_removed ()
+

 
e_cal_backend_notify_object_created, e_cal_backend_notify_object_created ()
 

 
e_cal_backend_notify_object_modified, e_cal_backend_notify_object_modified ()
diff -Nru evolution-data-server-2.24.1/docs/reference/calendar/libedata-cal/html/libedata-cal.devhelp evolution-data-server-2.24.1.1/docs/reference/calendar/libedata-cal/html/libedata-cal.devhelp
--- evolution-data-server-2.24.1/docs/reference/calendar/libedata-cal/html/libedata-cal.devhelp	2008-10-20 10:11:20.000000000 +0200
+++ evolution-data-server-2.24.1.1/docs/reference/calendar/libedata-cal/html/libedata-cal.devhelp	2008-11-07 07:55:28.000000000 +0100
@@ -1,8 +1,8 @@
 
 
-
+
   
-    
+    
       
       
       
@@ -65,6 +65,9 @@
     
     
     
+    
+    
+    
     
     
     
diff -Nru evolution-data-server-2.24.1/docs/reference/calendar/libedata-cal/html/libedata-cal.devhelp2 evolution-data-server-2.24.1.1/docs/reference/calendar/libedata-cal/html/libedata-cal.devhelp2
--- evolution-data-server-2.24.1/docs/reference/calendar/libedata-cal/html/libedata-cal.devhelp2	2008-10-20 10:11:20.000000000 +0200
+++ evolution-data-server-2.24.1.1/docs/reference/calendar/libedata-cal/html/libedata-cal.devhelp2	2008-11-07 07:55:28.000000000 +0100
@@ -1,8 +1,8 @@
 
 
-
+
   
-    
+    
       
       
       
@@ -65,6 +65,9 @@
     
     
     
+    
+    
+    
     
     
     
diff -Nru evolution-data-server-2.24.1/docs/reference/calendar/libedata-cal/html/libedata-cal-e-cal-backend-util.html evolution-data-server-2.24.1.1/docs/reference/calendar/libedata-cal/html/libedata-cal-e-cal-backend-util.html
--- evolution-data-server-2.24.1/docs/reference/calendar/libedata-cal/html/libedata-cal-e-cal-backend-util.html	2008-10-20 10:11:20.000000000 +0200
+++ evolution-data-server-2.24.1.1/docs/reference/calendar/libedata-cal/html/libedata-cal-e-cal-backend-util.html	2008-11-07 07:55:28.000000000 +0100
@@ -4,13 +4,13 @@
 
 e-cal-backend-util
 
-
-
+
+
 
 
 
 
-
+
 
 
 
@@ -19,7 +19,7 @@
 Prev
 Up
 Home
-Evolution API Reference: libedata-cal, the Calendar Backend Library
+Evolution-Data-Server Manual: Calendar Backend (libedata-cal)
 Next
 
 
diff -Nru evolution-data-server-2.24.1/docs/reference/calendar/libedata-cal/libedata-cal-docs.sgml evolution-data-server-2.24.1.1/docs/reference/calendar/libedata-cal/libedata-cal-docs.sgml
--- evolution-data-server-2.24.1/docs/reference/calendar/libedata-cal/libedata-cal-docs.sgml	2008-10-13 10:08:05.000000000 +0200
+++ evolution-data-server-2.24.1.1/docs/reference/calendar/libedata-cal/libedata-cal-docs.sgml	2008-11-07 05:34:23.000000000 +0100
@@ -3,11 +3,11 @@
                "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd">
 
   
-    Evolution API Reference: libedata-cal, the Calendar Backend Library
+    Evolution-Data-Server Manual: Calendar Backend (libedata-cal)
   
 
   
-    Evolution API Reference: libedata-cal, the Calendar Backend Library
+    Evolution-Data-Server Manual: Calendar Backend (libedata-cal)
     
     
     
diff -Nru evolution-data-server-2.24.1/docs/reference/calendar/libedata-cal/libedata-cal-sections.txt evolution-data-server-2.24.1.1/docs/reference/calendar/libedata-cal/libedata-cal-sections.txt
--- evolution-data-server-2.24.1/docs/reference/calendar/libedata-cal/libedata-cal-sections.txt	2008-10-13 10:08:05.000000000 +0200
+++ evolution-data-server-2.24.1.1/docs/reference/calendar/libedata-cal/libedata-cal-sections.txt	2008-11-07 05:34:23.000000000 +0100
@@ -159,7 +159,6 @@
 e_cal_backend_get_free_busy
 e_cal_backend_internal_get_default_timezone
 e_cal_backend_internal_get_timezone
-e_cal_backend_last_client_gone
 e_cal_backend_set_notification_proxy
 e_cal_backend_notify_object_created
 e_cal_backend_notify_object_modified
@@ -172,6 +171,9 @@
 e_cal_backend_notify_view_progress
 e_cal_backend_notify_readonly
 e_cal_backend_notify_cal_address
+e_cal_backend_notify_objects_added
+e_cal_backend_notify_objects_modified
+e_cal_backend_notify_objects_removed
 
 E_CAL_BACKEND
 E_IS_CAL_BACKEND
@@ -184,6 +186,23 @@
 
 
 

+e-cal-backend-loader-factory
+ECalBackendLoaderFactory
+ECalBackendLoaderFactory
+
+E_CAL_BACKEND_LOADER_FACTORY
+E_IS_CAL_BACKEND_LOADER_FACTORY
+E_TYPE_CAL_BACKEND_LOADER_FACTORY
+E_CAL_BACKEND_LOADER_FACTORY_CLASS
+E_IS_CAL_BACKEND_LOADER_FACTORY_CLASS
+E_CAL_BACKEND_LOADER_FACTORY_GET_CLASS
+ECalBackendLoaderFactoryClass
+
+ECalBackendLoaderFactoryPrivate
+e_cal_backend_loader_factory_get_type
+

+
+

 e-data-cal-factory
 EDataCalFactory
 EDataCalFactory
diff -Nru evolution-data-server-2.24.1/docs/reference/calendar/libedata-cal/tmpl/e-cal-backend-loader-factory.sgml evolution-data-server-2.24.1.1/docs/reference/calendar/libedata-cal/tmpl/e-cal-backend-loader-factory.sgml
--- evolution-data-server-2.24.1/docs/reference/calendar/libedata-cal/tmpl/e-cal-backend-loader-factory.sgml	1970-01-01 01:00:00.000000000 +0100
+++ evolution-data-server-2.24.1.1/docs/reference/calendar/libedata-cal/tmpl/e-cal-backend-loader-factory.sgml	2008-11-07 07:55:28.000000000 +0100
@@ -0,0 +1,28 @@
+
+ECalBackendLoaderFactory
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@parent_object: 
+
diff -Nru evolution-data-server-2.24.1/docs/reference/calendar/libedata-cal/tmpl/e-cal-backend.sgml evolution-data-server-2.24.1.1/docs/reference/calendar/libedata-cal/tmpl/e-cal-backend.sgml
--- evolution-data-server-2.24.1/docs/reference/calendar/libedata-cal/tmpl/e-cal-backend.sgml	2008-10-20 10:11:20.000000000 +0200
+++ evolution-data-server-2.24.1.1/docs/reference/calendar/libedata-cal/tmpl/e-cal-backend.sgml	2008-11-07 07:55:28.000000000 +0100
@@ -488,3 +488,33 @@
 @address: 
 
 
+
+
+
+
+
+@backend: 
+@query: 
+@objects: 
+
+
+
+
+
+
+
+@backend: 
+@query: 
+@objects: 
+
+
+
+
+
+
+
+@backend: 
+@query: 
+@ids: 
+
+
diff -Nru evolution-data-server-2.24.1/docs/reference/calendar/libedata-cal/xml/api-index-full.xml evolution-data-server-2.24.1.1/docs/reference/calendar/libedata-cal/xml/api-index-full.xml
--- evolution-data-server-2.24.1/docs/reference/calendar/libedata-cal/xml/api-index-full.xml	2008-10-20 10:11:20.000000000 +0200
+++ evolution-data-server-2.24.1.1/docs/reference/calendar/libedata-cal/xml/api-index-full.xml	2008-11-07 07:55:28.000000000 +0100
@@ -15,6 +15,7 @@
 ECalBackendCache:uri
 ECalBackendClass
 ECalBackendFactory
+ECalBackendLoaderFactory
 ECalBackendSExp
 ECalBackendSExpClass
 ECalBackendSync
@@ -83,6 +84,9 @@
 e_cal_backend_notify_cal_address
 e_cal_backend_notify_error
 e_cal_backend_notify_mode
+e_cal_backend_notify_objects_added
+e_cal_backend_notify_objects_modified
+e_cal_backend_notify_objects_removed
 e_cal_backend_notify_object_created
 e_cal_backend_notify_object_modified
 e_cal_backend_notify_object_removed
diff -Nru evolution-data-server-2.24.1/docs/reference/calendar/libedata-cal/xml/e-cal-backend-loader-factory.xml evolution-data-server-2.24.1.1/docs/reference/calendar/libedata-cal/xml/e-cal-backend-loader-factory.xml
--- evolution-data-server-2.24.1/docs/reference/calendar/libedata-cal/xml/e-cal-backend-loader-factory.xml	1970-01-01 01:00:00.000000000 +0100
+++ evolution-data-server-2.24.1.1/docs/reference/calendar/libedata-cal/xml/e-cal-backend-loader-factory.xml	2008-11-07 07:55:28.000000000 +0100
@@ -0,0 +1,54 @@
+
+
+
+
+ECalBackendLoaderFactory
+3
+LIBEDATA-CAL Library
+
+
+
+ECalBackendLoaderFactory
+
+
+
+
+Synopsis
+
+
+                    ECalBackendLoaderFactory;
+
+
+
+
+
+
+
+
+
+
+
+
+Description
+
+
+
+
+
+Details
+
+ECalBackendLoaderFactory
+ECalBackendLoaderFactorytypedef struct {
+	ECalBackendFactory	parent_object;
+} ECalBackendLoaderFactory;
+
+
+
+
+
+
+
+
+
+
diff -Nru evolution-data-server-2.24.1/docs/reference/calendar/libedata-cal/xml/e-cal-backend.xml evolution-data-server-2.24.1.1/docs/reference/calendar/libedata-cal/xml/e-cal-backend.xml
--- evolution-data-server-2.24.1/docs/reference/calendar/libedata-cal/xml/e-cal-backend.xml	2008-10-20 10:11:20.000000000 +0200
+++ evolution-data-server-2.24.1.1/docs/reference/calendar/libedata-cal/xml/e-cal-backend.xml	2008-11-07 07:55:28.000000000 +0100
@@ -143,6 +143,17 @@
                                                          gboolean read_only);
 void                e_cal_backend_notify_cal_address    (ECalBackend *backend,
                                                          char *address);
+void                e_cal_backend_notify_objects_added  (ECalBackend *backend,
+                                                         EDataCalView *query,
+                                                         const GList *objects);
+void                e_cal_backend_notify_objects_modified
+                                                        (ECalBackend *backend,
+                                                         EDataCalView *query,
+                                                         const GList *objects);
+void                e_cal_backend_notify_objects_removed
+                                                        (ECalBackend *backend,
+                                                         EDataCalView *query,
+                                                         const GList *ids);
 
 
 
@@ -1031,6 +1042,59 @@
 
 
 
+
+e_cal_backend_notify_objects_added ()
+e_cal_backend_notify_objects_addedvoid                e_cal_backend_notify_objects_added  (ECalBackend *backend,
+                                                         EDataCalView *query,
+                                                         const GList *objects);
+
+
+backend :
+
+
+query :
+
+
+objects :
+
+
+
+
+e_cal_backend_notify_objects_modified ()
+e_cal_backend_notify_objects_modifiedvoid                e_cal_backend_notify_objects_modified
+                                                        (ECalBackend *backend,
+                                                         EDataCalView *query,
+                                                         const GList *objects);
+
+
+backend :
+
+
+query :
+
+
+objects :
+
+
+
+
+e_cal_backend_notify_objects_removed ()
+e_cal_backend_notify_objects_removedvoid                e_cal_backend_notify_objects_removed
+                                                        (ECalBackend *backend,
+                                                         EDataCalView *query,
+                                                         const GList *ids);
+
+
+backend :
+
+
+query :
+
+
+ids :
+
+
+
 
 
 
diff -Nru evolution-data-server-2.24.1/docs/reference/libebackend/html/ch01.html evolution-data-server-2.24.1.1/docs/reference/libebackend/html/ch01.html
--- evolution-data-server-2.24.1/docs/reference/libebackend/html/ch01.html	2008-10-20 10:11:20.000000000 +0200
+++ evolution-data-server-2.24.1.1/docs/reference/libebackend/html/ch01.html	2008-11-07 07:55:29.000000000 +0100
@@ -2,27 +2,27 @@
 
 
 
-Evolution API Reference: libebackend, backend utility library
+Evolution-Data-Server Manual: Backend Utilities (libebackend)
 
-
-
-
+
+
+
 
 
 
-
+
 
 
 
-
+
 

 

-Evolution API Reference: libebackend, backend utility library

+Evolution-Data-Server Manual: Backend Utilities (libebackend)

 

 

 EFileCache
diff -Nru evolution-data-server-2.24.1/docs/reference/libebackend/html/EFileCache.html evolution-data-server-2.24.1.1/docs/reference/libebackend/html/EFileCache.html
--- evolution-data-server-2.24.1/docs/reference/libebackend/html/EFileCache.html	2008-10-20 10:11:20.000000000 +0200
+++ evolution-data-server-2.24.1.1/docs/reference/libebackend/html/EFileCache.html	2008-11-07 07:55:29.000000000 +0100
@@ -4,13 +4,13 @@
 
 EFileCache
 
-
-
-
+
+
+
 
 
 
-
+
 
 
 
@@ -18,7 +18,7 @@
 
-
+
-
+
-
+
 

@@ -481,6 +481,8 @@
 

 
e_source_group_add_source, e_source_group_add_source ()
 

+
e_source_group_equal, e_source_group_equal ()
+

 
e_source_group_foreach_property, e_source_group_foreach_property ()
 

 
e_source_group_get_property, e_source_group_get_property ()
@@ -525,6 +527,8 @@
 

 
e_source_group_update_from_xmldoc, e_source_group_update_from_xmldoc ()
 

+
e_source_group_xmlstr_equal, e_source_group_xmlstr_equal ()
+

 
e_source_list_add_group, e_source_list_add_group ()
 

 
e_source_list_is_gconf_updated, e_source_list_is_gconf_updated ()
@@ -597,6 +601,8 @@
 

 
e_source_update_from_xml_node, e_source_update_from_xml_node ()
 

+
e_source_xmlstr_equal, e_source_xmlstr_equal ()
+

 
e_strftime, e_strftime ()
 

 
e_strv_destroy, e_strv_destroy ()
diff -Nru evolution-data-server-2.24.1/docs/reference/libedataserver/html/libedataserver.devhelp evolution-data-server-2.24.1.1/docs/reference/libedataserver/html/libedataserver.devhelp
--- evolution-data-server-2.24.1/docs/reference/libedataserver/html/libedataserver.devhelp	2008-10-20 10:11:20.000000000 +0200
+++ evolution-data-server-2.24.1.1/docs/reference/libedataserver/html/libedataserver.devhelp	2008-11-07 07:55:29.000000000 +0100
@@ -1,8 +1,8 @@
 
 
-
+
   
-    
+    
       
       
       
@@ -241,7 +241,6 @@
     
     
     
-    
     
     
     
@@ -268,6 +267,8 @@
     
     
     
+    
+    
     
     
     
@@ -293,6 +294,8 @@
     
     
     
+    
+    
     
     
     
diff -Nru evolution-data-server-2.24.1/docs/reference/libedataserver/html/libedataserver.devhelp2 evolution-data-server-2.24.1.1/docs/reference/libedataserver/html/libedataserver.devhelp2
--- evolution-data-server-2.24.1/docs/reference/libedataserver/html/libedataserver.devhelp2	2008-10-20 10:11:20.000000000 +0200
+++ evolution-data-server-2.24.1.1/docs/reference/libedataserver/html/libedataserver.devhelp2	2008-11-07 07:55:29.000000000 +0100
@@ -1,8 +1,8 @@
 
 
-
+
   
-    
+    
       
       
       
@@ -241,7 +241,6 @@
     
     
     
-    
     
     
     
@@ -268,6 +267,8 @@
     
     
     
+    
+    
     
     
     
@@ -293,6 +294,8 @@
     
     
     
+    
+    
     
     
     
diff -Nru evolution-data-server-2.24.1/docs/reference/libedataserver/html/libedataserver-e-categories.html evolution-data-server-2.24.1.1/docs/reference/libedataserver/html/libedataserver-e-categories.html
--- evolution-data-server-2.24.1/docs/reference/libedataserver/html/libedataserver-e-categories.html	2008-10-20 10:11:20.000000000 +0200
+++ evolution-data-server-2.24.1.1/docs/reference/libedataserver/html/libedataserver-e-categories.html	2008-11-07 07:55:29.000000000 +0100
@@ -4,13 +4,13 @@
 
 e-categories
 
-
-
+
+
 
 
 
 
-
+
 
 
 
@@ -19,7 +19,7 @@
 Prev
 Up
 Home
-Evolution API Reference: libedataserver, utility library
+Evolution-Data-Server Manual: Utilities (libedataserver)
 Next
 
 
diff -Nru evolution-data-server-2.24.1/docs/reference/libedataserver/html/libedataserver-EFlag.html evolution-data-server-2.24.1.1/docs/reference/libedataserver/html/libedataserver-EFlag.html
--- evolution-data-server-2.24.1/docs/reference/libedataserver/html/libedataserver-EFlag.html	2008-10-20 10:11:20.000000000 +0200
+++ evolution-data-server-2.24.1.1/docs/reference/libedataserver/html/libedataserver-EFlag.html	2008-11-07 07:55:29.000000000 +0100
@@ -4,13 +4,13 @@
 
 EFlag
 
-
-
+
+
 
 
 
 
-
+
 
 
 
@@ -19,7 +19,7 @@
 Prev
 Up
 Home
-Evolution API Reference: libedataserver, utility library
+Evolution-Data-Server Manual: Utilities (libedataserver)
 Next
 
 
diff -Nru evolution-data-server-2.24.1/docs/reference/libedataserver/html/libedataserver-e-iconv.html evolution-data-server-2.24.1.1/docs/reference/libedataserver/html/libedataserver-e-iconv.html
--- evolution-data-server-2.24.1/docs/reference/libedataserver/html/libedataserver-e-iconv.html	2008-10-20 10:11:20.000000000 +0200
+++ evolution-data-server-2.24.1.1/docs/reference/libedataserver/html/libedataserver-e-iconv.html	2008-11-07 07:55:29.000000000 +0100
@@ -4,13 +4,13 @@
 
 e-iconv
 
-
-
+
+
 
 
 
 
-
+
 
 
 
@@ -19,7 +19,7 @@
 Prev
 Up
 Home
-Evolution API Reference: libedataserver, utility library
+Evolution-Data-Server Manual: Utilities (libedataserver)
 Next
 
 
diff -Nru evolution-data-server-2.24.1/docs/reference/libedataserver/html/libedataserver-e-memory.html evolution-data-server-2.24.1.1/docs/reference/libedataserver/html/libedataserver-e-memory.html
--- evolution-data-server-2.24.1/docs/reference/libedataserver/html/libedataserver-e-memory.html	2008-10-20 10:11:20.000000000 +0200
+++ evolution-data-server-2.24.1.1/docs/reference/libedataserver/html/libedataserver-e-memory.html	2008-11-07 07:55:29.000000000 +0100
@@ -4,13 +4,13 @@
 
 e-memory
 
-
-
+
+
 
 
 
 
-
+
 
 
 
@@ -19,7 +19,7 @@
 Prev
 Up
 Home
-Evolution API Reference: libedataserver, utility library
+Evolution-Data-Server Manual: Utilities (libedataserver)
 Next
 
 
diff -Nru evolution-data-server-2.24.1/docs/reference/libedataserver/html/libedataserver-e-msgport.html evolution-data-server-2.24.1.1/docs/reference/libedataserver/html/libedataserver-e-msgport.html
--- evolution-data-server-2.24.1/docs/reference/libedataserver/html/libedataserver-e-msgport.html	2008-10-20 10:11:20.000000000 +0200
+++ evolution-data-server-2.24.1.1/docs/reference/libedataserver/html/libedataserver-e-msgport.html	2008-11-07 07:55:29.000000000 +0100
@@ -4,13 +4,13 @@
 
 e-msgport
 
-
-
+
+
 
 
 
 
-
+
 
 
 
@@ -19,7 +19,7 @@
 Prev
 Up
 Home
-Evolution API Reference: libedataserver, utility library
+Evolution-Data-Server Manual: Utilities (libedataserver)
 Next
 
 
diff -Nru evolution-data-server-2.24.1/docs/reference/libedataserver/html/libedataserver-EProxy.html evolution-data-server-2.24.1.1/docs/reference/libedataserver/html/libedataserver-EProxy.html
--- evolution-data-server-2.24.1/docs/reference/libedataserver/html/libedataserver-EProxy.html	2008-10-20 10:11:20.000000000 +0200
+++ evolution-data-server-2.24.1.1/docs/reference/libedataserver/html/libedataserver-EProxy.html	2008-11-07 07:55:29.000000000 +0100
@@ -4,13 +4,13 @@
 
 EProxy
 
-
-
+
+
 
 
 
 
-
+
 
 
 
@@ -19,7 +19,7 @@
 Prev
 Up
 Home
-Evolution API Reference: libedataserver, utility library
+Evolution-Data-Server Manual: Utilities (libedataserver)
 Next
 
 
diff -Nru evolution-data-server-2.24.1/docs/reference/libedataserver/html/libedataserver-ESExp.html evolution-data-server-2.24.1.1/docs/reference/libedataserver/html/libedataserver-ESExp.html
--- evolution-data-server-2.24.1/docs/reference/libedataserver/html/libedataserver-ESExp.html	2008-10-20 10:11:20.000000000 +0200
+++ evolution-data-server-2.24.1.1/docs/reference/libedataserver/html/libedataserver-ESExp.html	2008-11-07 07:55:29.000000000 +0100
@@ -4,13 +4,13 @@
 
 ESExp
 
-
-
+
+
 
 
 
 
-
+
 
 
 
@@ -19,7 +19,7 @@
 Prev
 Up
 Home
-Evolution API Reference: libedataserver, utility library
+Evolution-Data-Server Manual: Utilities (libedataserver)
 Next
 
 
diff -Nru evolution-data-server-2.24.1/docs/reference/libedataserver/html/libedataserver-e-time-utils.html evolution-data-server-2.24.1.1/docs/reference/libedataserver/html/libedataserver-e-time-utils.html
--- evolution-data-server-2.24.1/docs/reference/libedataserver/html/libedataserver-e-time-utils.html	2008-10-20 10:11:20.000000000 +0200
+++ evolution-data-server-2.24.1.1/docs/reference/libedataserver/html/libedataserver-e-time-utils.html	2008-11-07 07:55:29.000000000 +0100
@@ -4,13 +4,13 @@
 
 Time-Related Utility Functions
 
-
-
+
+
 
 
 
 
-
+
 
 
 
@@ -19,7 +19,7 @@
 Prev
 Up
 Home
-Evolution API Reference: libedataserver, utility library
+Evolution-Data-Server Manual: Utilities (libedataserver)
 Next
 
 
diff -Nru evolution-data-server-2.24.1/docs/reference/libedataserver/html/libedataserver-e-trie.html evolution-data-server-2.24.1.1/docs/reference/libedataserver/html/libedataserver-e-trie.html
--- evolution-data-server-2.24.1/docs/reference/libedataserver/html/libedataserver-e-trie.html	2008-10-20 10:11:20.000000000 +0200
+++ evolution-data-server-2.24.1.1/docs/reference/libedataserver/html/libedataserver-e-trie.html	2008-11-07 07:55:29.000000000 +0100
@@ -4,13 +4,13 @@
 
 ETrie
 
-
-
+
+
 
 
 
 
-
+
 
 
 
@@ -19,7 +19,7 @@
 Prev
 Up
 Home
-Evolution API Reference: libedataserver, utility library
+Evolution-Data-Server Manual: Utilities (libedataserver)
 Next
 
 
diff -Nru evolution-data-server-2.24.1/docs/reference/libedataserver/html/libedataserver-e-uid.html evolution-data-server-2.24.1.1/docs/reference/libedataserver/html/libedataserver-e-uid.html
--- evolution-data-server-2.24.1/docs/reference/libedataserver/html/libedataserver-e-uid.html	2008-10-20 10:11:20.000000000 +0200
+++ evolution-data-server-2.24.1.1/docs/reference/libedataserver/html/libedataserver-e-uid.html	2008-11-07 07:55:29.000000000 +0100
@@ -4,13 +4,13 @@
 
 User ID Generation
 
-
-
+
+
 
 
 
 
-
+
 
 
 
@@ -19,7 +19,7 @@
 Prev
 Up
 Home
-Evolution API Reference: libedataserver, utility library
+Evolution-Data-Server Manual: Utilities (libedataserver)
 Next
 
 
diff -Nru evolution-data-server-2.24.1/docs/reference/libedataserver/html/libedataserver-e-url.html evolution-data-server-2.24.1.1/docs/reference/libedataserver/html/libedataserver-e-url.html
--- evolution-data-server-2.24.1/docs/reference/libedataserver/html/libedataserver-e-url.html	2008-10-20 10:11:20.000000000 +0200
+++ evolution-data-server-2.24.1.1/docs/reference/libedataserver/html/libedataserver-e-url.html	2008-11-07 07:55:29.000000000 +0100
@@ -4,13 +4,13 @@
 
 EUrl
 
-
-
+
+
 
 
 
 
-
+
 
 
 
@@ -19,7 +19,7 @@
 Prev
 Up
 Home
-Evolution API Reference: libedataserver, utility library
+Evolution-Data-Server Manual: Utilities (libedataserver)
 Next
 
 
diff -Nru evolution-data-server-2.24.1/docs/reference/libedataserver/html/libedataserver-e-util.html evolution-data-server-2.24.1.1/docs/reference/libedataserver/html/libedataserver-e-util.html
--- evolution-data-server-2.24.1/docs/reference/libedataserver/html/libedataserver-e-util.html	2008-10-20 10:11:20.000000000 +0200
+++ evolution-data-server-2.24.1.1/docs/reference/libedataserver/html/libedataserver-e-util.html	2008-11-07 07:55:29.000000000 +0100
@@ -4,13 +4,13 @@
 
 Utility Functions
 
-
-
+
+
 
 
 
 
-
+
 
 
 
@@ -19,7 +19,7 @@
 Prev
 Up
 Home
-Evolution API Reference: libedataserver, utility library
+Evolution-Data-Server Manual: Utilities (libedataserver)
 Next
 
 
diff -Nru evolution-data-server-2.24.1/docs/reference/libedataserver/html/libedataserver-e-xml-hash-utils.html evolution-data-server-2.24.1.1/docs/reference/libedataserver/html/libedataserver-e-xml-hash-utils.html
--- evolution-data-server-2.24.1/docs/reference/libedataserver/html/libedataserver-e-xml-hash-utils.html	2008-10-20 10:11:20.000000000 +0200
+++ evolution-data-server-2.24.1.1/docs/reference/libedataserver/html/libedataserver-e-xml-hash-utils.html	2008-11-07 07:55:29.000000000 +0100
@@ -4,13 +4,13 @@
 
 EXMLHash
 
-
-
+
+
 
 
 
 
-
+
 
 
 
@@ -19,7 +19,7 @@
 Prev
 Up
 Home
-Evolution API Reference: libedataserver, utility library
+Evolution-Data-Server Manual: Utilities (libedataserver)
 Next
 
 
diff -Nru evolution-data-server-2.24.1/docs/reference/libedataserver/html/libedataserver-md5-utils.html evolution-data-server-2.24.1.1/docs/reference/libedataserver/html/libedataserver-md5-utils.html
--- evolution-data-server-2.24.1/docs/reference/libedataserver/html/libedataserver-md5-utils.html	2008-10-20 10:11:20.000000000 +0200
+++ evolution-data-server-2.24.1.1/docs/reference/libedataserver/html/libedataserver-md5-utils.html	2008-11-07 07:55:29.000000000 +0100
@@ -4,13 +4,13 @@
 
 MD5 Utility Functions
 
-
-
+
+
 
 
 
 
-
+
 
 
 
@@ -19,7 +19,7 @@
 Prev
 Up
 Home
-Evolution API Reference: libedataserver, utility library
+Evolution-Data-Server Manual: Utilities (libedataserver)
 Next
 
 
diff -Nru evolution-data-server-2.24.1/docs/reference/libedataserver/html/libedataserver-Version-Information.html evolution-data-server-2.24.1.1/docs/reference/libedataserver/html/libedataserver-Version-Information.html
--- evolution-data-server-2.24.1/docs/reference/libedataserver/html/libedataserver-Version-Information.html	2008-10-20 10:11:20.000000000 +0200
+++ evolution-data-server-2.24.1.1/docs/reference/libedataserver/html/libedataserver-Version-Information.html	2008-11-07 07:55:29.000000000 +0100
@@ -4,13 +4,13 @@
 
 Version Information
 
-
-
+
+
 
 
 
 
-
+
 
 
 
@@ -19,7 +19,7 @@
 Prev
 Up
 Home
-Evolution API Reference: libedataserver, utility library
+Evolution-Data-Server Manual: Utilities (libedataserver)
 Next
 
 
@@ -181,7 +181,7 @@
 

 

 
EDS_MICRO_VERSION

-
#define EDS_MICRO_VERSION 1
+
#define EDS_MICRO_VERSION 1.1
 

 

 The micro version number of the Evolution-Data-Server library.  Like
diff -Nru evolution-data-server-2.24.1/docs/reference/libedataserver/libedataserver-docs.sgml evolution-data-server-2.24.1.1/docs/reference/libedataserver/libedataserver-docs.sgml
--- evolution-data-server-2.24.1/docs/reference/libedataserver/libedataserver-docs.sgml	2008-10-13 10:08:06.000000000 +0200
+++ evolution-data-server-2.24.1.1/docs/reference/libedataserver/libedataserver-docs.sgml	2008-11-07 05:34:23.000000000 +0100
@@ -3,11 +3,11 @@
                "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd">
 
   
-    Evolution API Reference: libedataserver, utility library
+    Evolution-Data-Server Manual: Utilities (libedataserver)
   
 
   
-    Evolution API Reference: libedataserver, utility library
+    Evolution-Data-Server Manual: Utilities (libedataserver)
     
     
     
diff -Nru evolution-data-server-2.24.1/docs/reference/libedataserver/libedataserver-sections.txt evolution-data-server-2.24.1.1/docs/reference/libedataserver/libedataserver-sections.txt
--- evolution-data-server-2.24.1/docs/reference/libedataserver/libedataserver-sections.txt	2008-10-13 10:08:06.000000000 +0200
+++ evolution-data-server-2.24.1.1/docs/reference/libedataserver/libedataserver-sections.txt	2008-11-07 05:34:23.000000000 +0100
@@ -210,6 +210,8 @@
 e_source_group_set_property
 e_source_group_foreach_property
 e_source_group_to_xml
+e_source_group_equal
+e_source_group_xmlstr_equal
 
 E_SOURCE_GROUP
 E_IS_SOURCE_GROUP
@@ -262,7 +264,6 @@
 e_source_new_from_xml_node
 e_source_new_from_standalone_xml
 e_source_copy
-e_source_equal
 e_source_update_from_xml_node
 e_source_uid_from_xml_node
 e_source_set_group
@@ -289,6 +290,8 @@
 e_source_foreach_property
 e_source_get_duped_property
 e_source_build_absolute_uri
+e_source_equal
+e_source_xmlstr_equal
 
 E_SOURCE
 E_IS_SOURCE
diff -Nru evolution-data-server-2.24.1/docs/reference/libedataserver/tmpl/e-source-group.sgml evolution-data-server-2.24.1.1/docs/reference/libedataserver/tmpl/e-source-group.sgml
--- evolution-data-server-2.24.1/docs/reference/libedataserver/tmpl/e-source-group.sgml	2008-10-20 10:11:20.000000000 +0200
+++ evolution-data-server-2.24.1.1/docs/reference/libedataserver/tmpl/e-source-group.sgml	2008-11-07 07:55:29.000000000 +0100
@@ -267,3 +267,23 @@
 @Returns: 
 
 
+
+
+
+
+
+@a: 
+@b: 
+@Returns: 
+
+
+
+
+
+
+
+@a: 
+@b: 
+@Returns: 
+
+
diff -Nru evolution-data-server-2.24.1/docs/reference/libedataserver/tmpl/e-source.sgml evolution-data-server-2.24.1.1/docs/reference/libedataserver/tmpl/e-source.sgml
--- evolution-data-server-2.24.1/docs/reference/libedataserver/tmpl/e-source.sgml	2008-10-20 10:11:20.000000000 +0200
+++ evolution-data-server-2.24.1.1/docs/reference/libedataserver/tmpl/e-source.sgml	2008-11-07 07:55:29.000000000 +0100
@@ -77,16 +77,6 @@
 @Returns: 
 
 
-
-
-
-
-
-@a: 
-@b: 
-@Returns: 
-
-
 
 
 
@@ -327,3 +317,23 @@
 @Returns: 
 
 
+
+
+
+
+
+@a: 
+@b: 
+@Returns: 
+
+
+
+
+
+
+
+@a: 
+@b: 
+@Returns: 
+
+
diff -Nru evolution-data-server-2.24.1/docs/reference/libedataserver/xml/api-index-full.xml evolution-data-server-2.24.1.1/docs/reference/libedataserver/xml/api-index-full.xml
--- evolution-data-server-2.24.1/docs/reference/libedataserver/xml/api-index-full.xml	2008-10-20 10:11:20.000000000 +0200
+++ evolution-data-server-2.24.1.1/docs/reference/libedataserver/xml/api-index-full.xml	2008-11-07 07:55:29.000000000 +0100
@@ -230,6 +230,7 @@
 e_source_get_readonly
 e_source_get_uri
 e_source_group_add_source
+e_source_group_equal
 e_source_group_foreach_property
 e_source_group_get_property
 e_source_group_get_readonly
@@ -252,6 +253,7 @@
 e_source_group_uid_from_xmldoc
 e_source_group_update_from_xml
 e_source_group_update_from_xmldoc
+e_source_group_xmlstr_equal
 e_source_list_add_group
 e_source_list_is_gconf_updated
 e_source_list_new
@@ -288,6 +290,7 @@
 e_source_uid_from_xml_node
 e_source_unset_color
 e_source_update_from_xml_node
+e_source_xmlstr_equal
 e_strftime
 e_strv_destroy
 e_strv_get
diff -Nru evolution-data-server-2.24.1/docs/reference/libedataserver/xml/eds-version.xml evolution-data-server-2.24.1.1/docs/reference/libedataserver/xml/eds-version.xml
--- evolution-data-server-2.24.1/docs/reference/libedataserver/xml/eds-version.xml	2008-10-20 10:11:20.000000000 +0200
+++ evolution-data-server-2.24.1.1/docs/reference/libedataserver/xml/eds-version.xml	2008-11-07 07:55:29.000000000 +0100
@@ -142,7 +142,7 @@
 
 
 EDS_MICRO_VERSION
-EDS_MICRO_VERSION#define EDS_MICRO_VERSION 1
+EDS_MICRO_VERSION#define EDS_MICRO_VERSION 1.1
 
 
 The micro version number of the Evolution-Data-Server library.  Like
diff -Nru evolution-data-server-2.24.1/docs/reference/libedataserver/xml/e-source-group.xml evolution-data-server-2.24.1.1/docs/reference/libedataserver/xml/e-source-group.xml
--- evolution-data-server-2.24.1/docs/reference/libedataserver/xml/e-source-group.xml	2008-10-20 10:11:20.000000000 +0200
+++ evolution-data-server-2.24.1.1/docs/reference/libedataserver/xml/e-source-group.xml	2008-11-07 07:55:29.000000000 +0100
@@ -60,6 +60,10 @@
                                                          GHFunc func,
                                                          gpointer data);
 char *              e_source_group_to_xml               (ESourceGroup *group);
+gboolean            e_source_group_equal                (ESourceGroup *a,
+                                                         ESourceGroup *b);
+gboolean            e_source_group_xmlstr_equal         (const gchar *a,
+                                                         const gchar *b);
 
 
 
@@ -418,6 +422,42 @@
 Returns :
 
 
+
+e_source_group_equal ()
+e_source_group_equalgboolean            e_source_group_equal                (ESourceGroup *a,
+                                                         ESourceGroup *b);
+
+Compares if a is equivalent to b.
+
+
+a :
+ An ESourceGroup
+
+b :
+ Another ESourceGroup
+
+Returns : TRUE if a is equivalent to b, 
+FALSE otherwise.
+
+
+
+e_source_group_xmlstr_equal ()
+e_source_group_xmlstr_equalgboolean            e_source_group_xmlstr_equal         (const gchar *a,
+                                                         const gchar *b);
+
+Compares if a is equivalent to b.
+
+
+a :
+ XML representation of an ESourceGroup
+
+b :
+ XML representation of another ESourceGroup
+
+Returns : TRUE if a is equivalent to b, 
+FALSE otherwise.
+
+
 
 
 
diff -Nru evolution-data-server-2.24.1/docs/reference/libedataserver/xml/e-source.xml evolution-data-server-2.24.1.1/docs/reference/libedataserver/xml/e-source.xml
--- evolution-data-server-2.24.1/docs/reference/libedataserver/xml/e-source.xml	2008-10-20 10:11:20.000000000 +0200
+++ evolution-data-server-2.24.1.1/docs/reference/libedataserver/xml/e-source.xml	2008-11-07 07:55:29.000000000 +0100
@@ -25,8 +25,6 @@
 ESource *           e_source_new_from_xml_node          (xmlNodePtr node);
 ESource *           e_source_new_from_standalone_xml    (const char *xml);
 ESource *           e_source_copy                       (ESource *source);
-gboolean            e_source_equal                      (ESource *a,
-                                                         ESource *b);
 gboolean            e_source_update_from_xml_node       (ESource *source,
                                                          xmlNodePtr node,
                                                          gboolean *changed_return);
@@ -70,6 +68,10 @@
 char *              e_source_get_duped_property         (ESource *source,
                                                          const char *property);
 char *              e_source_build_absolute_uri         (ESource *source);
+gboolean            e_source_equal                      (ESource *a,
+                                                         ESource *b);
+gboolean            e_source_xmlstr_equal               (const gchar *a,
+                                                         const gchar *b);
 
 
 
@@ -170,21 +172,6 @@
 Returns :
 
 
-
-e_source_equal ()
-e_source_equalgboolean            e_source_equal                      (ESource *a,
-                                                         ESource *b);
-
-
-a :
-
-
-b :
-
-
-Returns :
-
-
 
 e_source_update_from_xml_node ()
 e_source_update_from_xml_nodegboolean            e_source_update_from_xml_node       (ESource *source,
@@ -535,6 +522,39 @@
 Returns :
 
 
+
+e_source_equal ()
+e_source_equalgboolean            e_source_equal                      (ESource *a,
+                                                         ESource *b);
+
+
+a :
+
+
+b :
+
+
+Returns :
+
+
+
+e_source_xmlstr_equal ()
+e_source_xmlstr_equalgboolean            e_source_xmlstr_equal               (const gchar *a,
+                                                         const gchar *b);
+
+Compares if a is equivalent to b.
+
+
+a :
+ XML representation of an ESource
+
+b :
+ XML representation of another ESource
+
+Returns : TRUE if a is equivalent to b, 
+FALSE otherwise.
+
+
 
 
 
diff -Nru evolution-data-server-2.24.1/docs/reference/libedataserverui/html/ch01.html evolution-data-server-2.24.1.1/docs/reference/libedataserverui/html/ch01.html
--- evolution-data-server-2.24.1/docs/reference/libedataserverui/html/ch01.html	2008-10-20 10:11:20.000000000 +0200
+++ evolution-data-server-2.24.1.1/docs/reference/libedataserverui/html/ch01.html	2008-11-07 07:55:29.000000000 +0100
@@ -2,15 +2,15 @@
 
 
 
-Evolution API Reference: libedataserverui, graphical utility library
+Evolution-Data-Server Manual: Graphical Utilities (libedataserverui)
 
-
-
-
+
+
+
 
 
 
-
+
 
 
 
@@ -18,12 +18,12 @@
 Prev
  
 Home
-Evolution API Reference: libedataserverui, graphical utility library
+Evolution-Data-Server Manual: Graphical Utilities (libedataserverui)
 Next
 
 

 

-Evolution API Reference: libedataserverui, graphical utility library

+Evolution-Data-Server Manual: Graphical Utilities (libedataserverui)

 

 

 e-book-auth-util
diff -Nru evolution-data-server-2.24.1/docs/reference/libedataserverui/html/ECategoriesDialog.html evolution-data-server-2.24.1.1/docs/reference/libedataserverui/html/ECategoriesDialog.html
--- evolution-data-server-2.24.1/docs/reference/libedataserverui/html/ECategoriesDialog.html	2008-10-20 10:11:20.000000000 +0200
+++ evolution-data-server-2.24.1.1/docs/reference/libedataserverui/html/ECategoriesDialog.html	2008-11-07 07:55:29.000000000 +0100
@@ -4,13 +4,13 @@
 
 ECategoriesDialog
 
-
-
+
+
 
 
 
 
-
+
 
 
 
@@ -19,7 +19,7 @@
 Prev
 Up
 Home
-Evolution API Reference: libedataserverui, graphical utility library
+Evolution-Data-Server Manual: Graphical Utilities (libedataserverui)
 Next
 
 
diff -Nru evolution-data-server-2.24.1/docs/reference/libedataserverui/html/EContactStore.html evolution-data-server-2.24.1.1/docs/reference/libedataserverui/html/EContactStore.html
--- evolution-data-server-2.24.1/docs/reference/libedataserverui/html/EContactStore.html	2008-10-20 10:11:20.000000000 +0200
+++ evolution-data-server-2.24.1.1/docs/reference/libedataserverui/html/EContactStore.html	2008-11-07 07:55:29.000000000 +0100
@@ -4,13 +4,13 @@
 
 EContactStore
 
-
-
+
+
 
 
 
 
-
+
 
 
 
@@ -19,7 +19,7 @@
 Prev
 Up
 Home
-Evolution API Reference: libedataserverui, graphical utility library
+Evolution-Data-Server Manual: Graphical Utilities (libedataserverui)
 Next
 
 
@@ -46,24 +46,40 @@
 
                     EContactStore;
 EContactStore *     e_contact_store_new                 (void);
-EBook *             e_contact_store_get_book            (EContactStore *contact_store,
+EBook *             e_contact_store_get_book            (EContactStore *contact_store,
                                                          GtkTreeIter *iter);
-EContact *          e_contact_store_get_contact         (EContactStore *contact_store,
+EContact *          e_contact_store_get_contact         (EContactStore *contact_store,
                                                          GtkTreeIter *iter);
 gboolean            e_contact_store_find_contact        (EContactStore *contact_store,
                                                          const gchar *uid,
                                                          GtkTreeIter *iter);
 GList *             e_contact_store_get_books           (EContactStore *contact_store);
 void                e_contact_store_add_book            (EContactStore *contact_store,
-                                                         EBook *book);
+                                                         EBook *book);
 void                e_contact_store_remove_book         (EContactStore *contact_store,
-                                                         EBook *book);
+                                                         EBook *book);
 void                e_contact_store_set_query           (EContactStore *contact_store,
-                                                         EBookQuery *book_query);
-EBookQuery *        e_contact_store_peek_query          (EContactStore *contact_store);
-EBookView *         find_contact_source_by_book_return_view
+                                                         EBookQuery *book_query);
+EBookQuery *        e_contact_store_peek_query          (EContactStore *contact_store);
+EBookView *         find_contact_source_by_book_return_view
                                                         (EContactStore *contact_store,
-                                                         EBook *book);
+                                                         EBook *book);
 

 

 

@@ -112,10 +128,14 @@
 

 

 
e_contact_store_get_book ()

-
EBook *             e_contact_store_get_book            (EContactStore *contact_store,
+
EBook *             e_contact_store_get_book            (EContactStore *contact_store,
                                                          GtkTreeIter *iter);

 

-Gets the EBook that provided the contact at iter.

+Gets the EBook that provided the contact at iter.

 

 

 

@@ -133,7 +153,9 @@
 
-
@@ -142,10 +164,14 @@
 

 
e_contact_store_get_contact ()

-
EContact *          e_contact_store_get_contact         (EContactStore *contact_store,
+
EContact *          e_contact_store_get_contact         (EContactStore *contact_store,
                                                          GtkTreeIter *iter);

 

-Gets the EContact at iter.

+Gets the EContact at iter.

 

 

 

 

 
Returns :
 An EBook.
+ An EBook.
 
 

 
 

@@ -163,7 +189,9 @@
 
-
@@ -223,7 +251,9 @@
 
-
@@ -234,7 +264,9 @@
 

 
e_contact_store_add_book ()

 
void                e_contact_store_add_book            (EContactStore *contact_store,
-                                                         EBook *book);

+                                                         EBook *book);
 

 Adds book to the list of books that provide contacts for contact_store.

 

@@ -249,7 +281,9 @@
 
 

-
@@ -259,7 +293,9 @@
 

 
e_contact_store_remove_book ()

 
void                e_contact_store_remove_book         (EContactStore *contact_store,
-                                                         EBook *book);

+                                                         EBook *book);
 

 Removes book from the list of books that provide contacts for contact_store.

 

@@ -274,7 +310,9 @@
 
 

-
@@ -284,7 +322,9 @@
 

 
e_contact_store_set_query ()

 
void                e_contact_store_set_query           (EContactStore *contact_store,
-                                                         EBookQuery *book_query);

+                                                         EBookQuery *book_query);
 

 Sets book_query to be the query used to fetch contacts from the books
 assigned to contact_store.

@@ -300,7 +340,9 @@
 
 

-
@@ -309,7 +351,9 @@
 

 
e_contact_store_peek_query ()

-
EBookQuery *        e_contact_store_peek_query          (EContactStore *contact_store);

+
EBookQuery *        e_contact_store_peek_query          (EContactStore *contact_store);

 

 Gets the query that's being used to fetch contacts from the books
 assigned to contact_store.

@@ -325,7 +369,9 @@
 
 

-
@@ -334,9 +380,13 @@
 

 
find_contact_source_by_book_return_view ()

-
EBookView *         find_contact_source_by_book_return_view
+
EBookView *         find_contact_source_by_book_return_view
                                                         (EContactStore *contact_store,
-                                                         EBook *book);

+                                                         EBook *book);

 

 

 

 

 
Returns :
 An EContact.
+ An EContact.
 
 

 
 

 
Returns :
 A GList of pointers to EBook. The caller owns the list,
+ A GList of pointers to EBook. The caller owns the list,
 but not the books.
 
 

 
book :
 an EBook
+ an EBook
 
 

 

 
book :
 an EBook
+ an EBook
 
 

 

 
book_query :
 an EBookQuery
+ an EBookQuery
 
 

 
 

 
Returns :
 The EBookQuery being used.
+ The EBookQuery being used.
 
 

 
 

diff -Nru evolution-data-server-2.24.1/docs/reference/libedataserverui/html/EDestinationStore.html evolution-data-server-2.24.1.1/docs/reference/libedataserverui/html/EDestinationStore.html
--- evolution-data-server-2.24.1/docs/reference/libedataserverui/html/EDestinationStore.html	2008-10-20 10:11:20.000000000 +0200
+++ evolution-data-server-2.24.1.1/docs/reference/libedataserverui/html/EDestinationStore.html	2008-11-07 07:55:29.000000000 +0100
@@ -4,13 +4,13 @@
 EDestinationStore
-
-
+
+
-
+
@@ -19,7 +19,7 @@
 
-
+
-
+
-
+
-
+
-
+

 
 
 
 
 
 
 
 
 
Prev
 Up
 HomeEvolution API Reference: libedataserverui, graphical utility libraryEvolution-Data-Server Manual: Graphical Utilities (libedataserverui)
 Next
 

 

@@ -47,20 +47,28 @@
                     EDestinationStore;
 enum                EDestinationStoreColumnType;
 EDestinationStore * e_destination_store_new             (void);
-EDestination *      e_destination_store_get_destination (EDestinationStore *destination_store,
+EDestination *      e_destination_store_get_destination (EDestinationStore *destination_store,
                                                          GtkTreeIter *iter);
 GList *             e_destination_store_list_destinations
                                                         (EDestinationStore *destination_store);
 void                e_destination_store_insert_destination
                                                         (EDestinationStore *destination_store,
                                                          gint index,
-                                                         EDestination *destination);
+                                                         EDestination *destination);
 void                e_destination_store_append_destination
                                                         (EDestinationStore *destination_store,
-                                                         EDestination *destination);
+                                                         EDestination *destination);
 void                e_destination_store_remove_destination
                                                         (EDestinationStore *destination_store,
-                                                         EDestination *destination);
+                                                         EDestination *destination);
 void                e_destination_store_remove_destination_nth
                                                         (EDestinationStore *destination_store,
                                                          int n);
@@ -132,10 +140,14 @@
 

 

 
e_destination_store_get_destination ()

-
EDestination *      e_destination_store_get_destination (EDestinationStore *destination_store,
+
EDestination *      e_destination_store_get_destination (EDestinationStore *destination_store,
                                                          GtkTreeIter *iter);

 

-Gets the EDestination from destination_store at iter.

+Gets the EDestination from destination_store at iter.

 

 

 

@@ -153,7 +165,9 @@
 
-
@@ -178,8 +192,12 @@
 
-
@@ -191,7 +209,9 @@
 
void                e_destination_store_insert_destination
                                                         (EDestinationStore *destination_store,
                                                          gint index,
-                                                         EDestination *destination);

+                                                         EDestination *destination);

 Inserts destination into destination_store at the position
 indicated by index. destination_store will ref destination.

@@ -212,7 +232,9 @@
 
-
@@ -223,7 +245,9 @@
 
e_destination_store_append_destination ()
void                e_destination_store_append_destination
                                                         (EDestinationStore *destination_store,
-                                                         EDestination *destination);

+                                                         EDestination *destination);

 Appends destination to the list of destinations in destination_store.
 destination_store will ref destination.

@@ -239,7 +263,9 @@
 
-
@@ -250,7 +276,9 @@
 
e_destination_store_remove_destination ()
void                e_destination_store_remove_destination
                                                         (EDestinationStore *destination_store,
-                                                         EDestination *destination);

+                                                         EDestination *destination);

 Removes destination from destination_store. destination_store will
 unref destination.

@@ -266,7 +294,9 @@
 
-
diff -Nru evolution-data-server-2.24.1/docs/reference/libedataserverui/html/ENameSelectorDialog.html evolution-data-server-2.24.1.1/docs/reference/libedataserverui/html/ENameSelectorDialog.html
--- evolution-data-server-2.24.1/docs/reference/libedataserverui/html/ENameSelectorDialog.html	2008-10-20 10:11:20.000000000 +0200
+++ evolution-data-server-2.24.1.1/docs/reference/libedataserverui/html/ENameSelectorDialog.html	2008-11-07 07:55:29.000000000 +0100
@@ -4,13 +4,13 @@
 ENameSelectorDialog
-
-
+
+
-
+
@@ -19,7 +19,7 @@
 
-
+
-
+

 

 
Returns :
 An EDestination.
+ An EDestination.
 
 

 
 

 
Returns :
 A GList of pointers to EDestination. The list is owned
-by the caller, but the EDestination elements aren't.
+ A GList of pointers to EDestination. The list is owned
+by the caller, but the EDestination elements aren't.
 
 

 
 
 

 
destination :
 an EDestination to insert
+ an EDestination to insert
 
 

 
 
 
 

 
destination :
 an EDestination
+ an EDestination
 
 

 
 
 
 

 
destination :
 an EDestination to remove
+ an EDestination to remove
 
 

 
 
 
 
 
 
 
 
 
 
Prev
 Up
 HomeEvolution API Reference: libedataserverui, graphical utility libraryEvolution-Data-Server Manual: Graphical Utilities (libedataserverui)
 Next
 

 

diff -Nru evolution-data-server-2.24.1/docs/reference/libedataserverui/html/ENameSelectorEntry.html evolution-data-server-2.24.1.1/docs/reference/libedataserverui/html/ENameSelectorEntry.html
--- evolution-data-server-2.24.1/docs/reference/libedataserverui/html/ENameSelectorEntry.html	2008-10-20 10:11:20.000000000 +0200
+++ evolution-data-server-2.24.1.1/docs/reference/libedataserverui/html/ENameSelectorEntry.html	2008-11-07 07:55:29.000000000 +0100
@@ -4,13 +4,13 @@
 
 ENameSelectorEntry
 
-
-
+
+
 
 
 
 
-
+
 
 
 
@@ -19,7 +19,7 @@
 Prev
 Up
 HomeEvolution API Reference: libedataserverui, graphical utility libraryEvolution-Data-Server Manual: Graphical Utilities (libedataserverui)
 Next
 

 

@@ -47,6 +47,8 @@
 
Synopsis

 
 #define             MINIMUM_QUERY_LENGTH
+#define             FORCE_SHOW_ADDRESS
+#define             USER_QUERY_FIELDS
                     ENameSelectorEntry;
 ENameSelectorEntry * e_name_selector_entry_new          (void);
 EContactStore *     e_name_selector_entry_peek_contact_store
@@ -65,6 +67,9 @@
 void                e_name_selector_entry_set_contact_list_editor_func
                                                         (ENameSelectorEntry *name_selector_entry,
                                                          gpointer func);
+gchar *             ens_util_populate_user_query_fields (GSList *user_query_fields,
+                                                         const char *cue_str,
+                                                         const char *encoded_cue_str);
 

 
 

@@ -107,6 +112,22 @@
 

 

 

+
FORCE_SHOW_ADDRESS

+
#define FORCE_SHOW_ADDRESS   "/apps/evolution/addressbook/completion/show_address"
+

+

+

+

+

+

+
USER_QUERY_FIELDS

+
#define USER_QUERY_FIELDS "/apps/evolution/addressbook/completion/user_query_fields"
+

+

+

+

+

+

 
ENameSelectorEntry

 
typedef struct _ENameSelectorEntry ENameSelectorEntry;

 

@@ -284,6 +305,42 @@
 

 

 

+

+

+
ens_util_populate_user_query_fields ()

+
gchar *             ens_util_populate_user_query_fields (GSList *user_query_fields,
+                                                         const char *cue_str,
+                                                         const char *encoded_cue_str);

+

+

+

+

+

++
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+


user_query_fields :

+
cue_str :

+
encoded_cue_str :

+
Returns :

+

+

 
 

 
Signal Details

diff -Nru evolution-data-server-2.24.1/docs/reference/libedataserverui/html/ENameSelector.html evolution-data-server-2.24.1.1/docs/reference/libedataserverui/html/ENameSelector.html
--- evolution-data-server-2.24.1/docs/reference/libedataserverui/html/ENameSelector.html	2008-10-20 10:11:20.000000000 +0200
+++ evolution-data-server-2.24.1.1/docs/reference/libedataserverui/html/ENameSelector.html	2008-11-07 07:55:29.000000000 +0100
@@ -4,13 +4,13 @@
 
 ENameSelector
 
-
-
+
+
 
 
 
 
-
+
 
 
 
@@ -19,7 +19,7 @@
 
Prev
 Up
 HomeEvolution API Reference: libedataserverui, graphical utility libraryEvolution-Data-Server Manual: Graphical Utilities (libedataserverui)
 Next
 

 

diff -Nru evolution-data-server-2.24.1/docs/reference/libedataserverui/html/ENameSelectorList.html evolution-data-server-2.24.1.1/docs/reference/libedataserverui/html/ENameSelectorList.html
--- evolution-data-server-2.24.1/docs/reference/libedataserverui/html/ENameSelectorList.html	2008-10-20 10:11:20.000000000 +0200
+++ evolution-data-server-2.24.1.1/docs/reference/libedataserverui/html/ENameSelectorList.html	2008-11-07 07:55:29.000000000 +0100
@@ -4,13 +4,13 @@
 
 ENameSelectorList
 
-
-
+
+
 
 
 
 
-
+
 
 
 
@@ -19,7 +19,7 @@
 Prev
 Up
 HomeEvolution API Reference: libedataserverui, graphical utility libraryEvolution-Data-Server Manual: Graphical Utilities (libedataserverui)
 Next
 

 

diff -Nru evolution-data-server-2.24.1/docs/reference/libedataserverui/html/ENameSelectorModel.html evolution-data-server-2.24.1.1/docs/reference/libedataserverui/html/ENameSelectorModel.html
--- evolution-data-server-2.24.1/docs/reference/libedataserverui/html/ENameSelectorModel.html	2008-10-20 10:11:20.000000000 +0200
+++ evolution-data-server-2.24.1.1/docs/reference/libedataserverui/html/ENameSelectorModel.html	2008-11-07 07:55:29.000000000 +0100
@@ -4,13 +4,13 @@
 
 ENameSelectorModel
 
-
-
+
+
 
 
 
 
-
+
 
 
 
@@ -19,7 +19,7 @@
 Prev
 Up
 HomeEvolution API Reference: libedataserverui, graphical utility libraryEvolution-Data-Server Manual: Graphical Utilities (libedataserverui)
 Next
 

 

diff -Nru evolution-data-server-2.24.1/docs/reference/libedataserverui/html/ESourceComboBox.html evolution-data-server-2.24.1.1/docs/reference/libedataserverui/html/ESourceComboBox.html
--- evolution-data-server-2.24.1/docs/reference/libedataserverui/html/ESourceComboBox.html	2008-10-20 10:11:20.000000000 +0200
+++ evolution-data-server-2.24.1.1/docs/reference/libedataserverui/html/ESourceComboBox.html	2008-11-07 07:55:29.000000000 +0100
@@ -4,13 +4,13 @@
 
 ESourceComboBox
 
-
-
+
+
 
 
 
 
-
+
 
 
 
@@ -19,7 +19,7 @@
 Prev
 Up
 HomeEvolution API Reference: libedataserverui, graphical utility libraryEvolution-Data-Server Manual: Graphical Utilities (libedataserverui)
 Next
 

 

@@ -47,13 +47,23 @@
 
Synopsis

 
                     ESourceComboBox;
-GtkWidget *         e_source_combo_box_new              (ESourceList *source_list);
-ESourceList *       e_source_combo_box_get_source_list  (ESourceComboBox *source_combo_box);
+GtkWidget *         e_source_combo_box_new              (ESourceList *source_list);
+ESourceList *       e_source_combo_box_get_source_list  (ESourceComboBox *source_combo_box);
 void                e_source_combo_box_set_source_list  (ESourceComboBox *source_combo_box,
-                                                         ESourceList *source_list);
-ESource *           e_source_combo_box_get_active       (ESourceComboBox *source_combo_box);
+                                                         ESourceList *source_list);
+ESource *           e_source_combo_box_get_active       (ESourceComboBox *source_combo_box);
 void                e_source_combo_box_set_active       (ESourceComboBox *source_combo_box,
-                                                         ESource *source);
+                                                         ESource *source);
 const gchar *       e_source_combo_box_get_active_uid   (ESourceComboBox *source_combo_box);
 void                e_source_combo_box_set_active_uid   (ESourceComboBox *source_combo_box,
                                                          const gchar *uid);
@@ -81,7 +91,9 @@
 

 
Properties

 
-  "source-list"              ESourceList*          : Read / Write
+  "source-list"              ESourceList*          : Read / Write
 

 

 

@@ -100,10 +112,16 @@
 

 

 
e_source_combo_box_new ()

-
GtkWidget *         e_source_combo_box_new              (ESourceList *source_list);

-

-Creates a new ESourceComboBox widget that lets the user pick an ESource
-from the provided ESourceList.

+
GtkWidget *         e_source_combo_box_new              (ESourceList *source_list);

+

+Creates a new ESourceComboBox widget that lets the user pick an ESource
+from the provided ESourceList.

 

 

 

@@ -111,7 +129,9 @@
 
-
@@ -125,9 +145,13 @@
 

 
e_source_combo_box_get_source_list ()

-
ESourceList *       e_source_combo_box_get_source_list  (ESourceComboBox *source_combo_box);

-

-Returns the ESourceList which is acting as a data source for
+
ESourceList *       e_source_combo_box_get_source_list  (ESourceComboBox *source_combo_box);

+

+Returns the ESourceList which is acting as a data source for
 source_combo_box.

 

 

@@ -141,7 +165,9 @@
 

-
@@ -151,7 +177,9 @@
 

 
e_source_combo_box_set_source_list ()

 
void                e_source_combo_box_set_source_list  (ESourceComboBox *source_combo_box,
-                                                         ESourceList *source_list);

+                                                         ESourceList *source_list);
 

 Sets the source list used by source_combo_box to be source_list.  This
 causes the contents of source_combo_box to be regenerated.

@@ -167,7 +195,9 @@
 
 

-
@@ -176,9 +206,13 @@
 

 
e_source_combo_box_get_active ()

-
ESource *           e_source_combo_box_get_active       (ESourceComboBox *source_combo_box);

-

-Returns the ESource corresponding to the currently active item, or NULL
+
ESource *           e_source_combo_box_get_active       (ESourceComboBox *source_combo_box);

+

+Returns the ESource corresponding to the currently active item, or NULL
 if there is no active item.

 

 

@@ -192,7 +226,9 @@
 
 

-
@@ -202,7 +238,9 @@
 

 
e_source_combo_box_set_active ()

 
void                e_source_combo_box_set_active       (ESourceComboBox *source_combo_box,
-                                                         ESource *source);

+                                                         ESource *source);
 

 Sets the active item to the one corresponding to source.

 

@@ -217,7 +255,9 @@
 
 

-
@@ -228,7 +268,9 @@
 
e_source_combo_box_get_active_uid ()
const gchar *       e_source_combo_box_get_active_uid   (ESourceComboBox *source_combo_box);

-Returns the unique ID of the ESource corresponding to the currently
+Returns the unique ID of the ESource corresponding to the currently
 active item, or NULL if there is no active item.

 

@@ -267,7 +309,9 @@
 
-
@@ -278,7 +322,9 @@
 
Property Details

 
The "source-list" property

-
  "source-list"              ESourceList*          : Read / Write

+
  "source-list"              ESourceList*          : Read / Write

 
List of sources to choose from.

 

diff -Nru evolution-data-server-2.24.1/docs/reference/libedataserverui/html/ESourceOptionMenu.html evolution-data-server-2.24.1.1/docs/reference/libedataserverui/html/ESourceOptionMenu.html
--- evolution-data-server-2.24.1/docs/reference/libedataserverui/html/ESourceOptionMenu.html	2008-10-20 10:11:20.000000000 +0200
+++ evolution-data-server-2.24.1.1/docs/reference/libedataserverui/html/ESourceOptionMenu.html	2008-11-07 07:55:29.000000000 +0100
@@ -4,13 +4,13 @@
 ESourceOptionMenu
-
-
+
+
-
+
@@ -19,7 +19,7 @@
 
-
+

 

 
source_list :
 an ESourceList
+ an ESourceList
 
 

 

 

 

 
Returns :
 an ESourceList
+ an ESourceList
 
 

 

 
source_list :
 an ESourceList
+ an ESourceList
 
 

 
 

 
Returns :
 an ESource or NULL
+ an ESource or NULL
 
 

 

 
source :
 an ESource
+ an ESource
 
 

 
 
 
 
 

 
uid :
 a unique ID of an ESource
+ a unique ID of an ESource
 
 

 
 
 
 
 
 
 
 
 
 
 
 
Prev
 Up
 HomeEvolution API Reference: libedataserverui, graphical utility libraryEvolution-Data-Server Manual: Graphical Utilities (libedataserverui)
 Next
 

 

@@ -47,10 +47,16 @@
 
Synopsis

 
                     ESourceOptionMenu;
-GtkWidget *         e_source_option_menu_new            (ESourceList *list);
-ESource *           e_source_option_menu_peek_selected  (ESourceOptionMenu *menu);
+GtkWidget *         e_source_option_menu_new            (ESourceList *list);
+ESource *           e_source_option_menu_peek_selected  (ESourceOptionMenu *menu);
 void                e_source_option_menu_select         (ESourceOptionMenu *menu,
-                                                         ESource *source);
+                                                         ESource *source);
 

 
 

@@ -99,14 +105,20 @@
 

 

 
e_source_option_menu_new ()

-
GtkWidget *         e_source_option_menu_new            (ESourceList *list);

+
GtkWidget *         e_source_option_menu_new            (ESourceList *list);

 

 
Warning

 
e_source_option_menu_new is deprecated and should not be used in newly-written code.

 

 

 Creates a new ESourceOptionMenu widget that lets the user pick
-an ESource from the provided ESourceList.

+an ESource from the provided ESourceList.

 

 

 

@@ -128,7 +140,9 @@
 

 
e_source_option_menu_peek_selected ()

-
ESource *           e_source_option_menu_peek_selected  (ESourceOptionMenu *menu);

+
ESource *           e_source_option_menu_peek_selected  (ESourceOptionMenu *menu);

 

 
Warning

 
e_source_option_menu_peek_selected is deprecated and should not be used in newly-written code.

@@ -147,7 +161,9 @@
 
 

-
@@ -157,14 +173,18 @@
 

 
e_source_option_menu_select ()

 
void                e_source_option_menu_select         (ESourceOptionMenu *menu,
-                                                         ESource *source);

+                                                         ESource *source);
 

 
Warning

 
e_source_option_menu_select is deprecated and should not be used in newly-written code.

 

 

 Programmatically selects a source in menu. source must be present
-in menu's ESourceList.

+in menu's ESourceList.

 

 

 

 

 
Returns :
 The selected ESource, or NULL if none was selected.
+ The selected ESource, or NULL if none was selected.
 
 

 

@@ -177,7 +197,9 @@
 
-
diff -Nru evolution-data-server-2.24.1/docs/reference/libedataserverui/html/ESourceSelectorDialog.html evolution-data-server-2.24.1.1/docs/reference/libedataserverui/html/ESourceSelectorDialog.html
--- evolution-data-server-2.24.1/docs/reference/libedataserverui/html/ESourceSelectorDialog.html	2008-10-20 10:11:20.000000000 +0200
+++ evolution-data-server-2.24.1.1/docs/reference/libedataserverui/html/ESourceSelectorDialog.html	2008-11-07 07:55:29.000000000 +0100
@@ -4,13 +4,13 @@
 ESourceSelectorDialog
-
-
+
+
-
+
@@ -19,7 +19,7 @@
 
-
+
-
+
-
+
-
@@ -88,7 +104,9 @@
 
-
diff -Nru evolution-data-server-2.24.1/docs/reference/libedataserverui/html/libedataserverui-ECellRendererColor.html evolution-data-server-2.24.1.1/docs/reference/libedataserverui/html/libedataserverui-ECellRendererColor.html
--- evolution-data-server-2.24.1/docs/reference/libedataserverui/html/libedataserverui-ECellRendererColor.html	2008-10-20 10:11:20.000000000 +0200
+++ evolution-data-server-2.24.1.1/docs/reference/libedataserverui/html/libedataserverui-ECellRendererColor.html	2008-11-07 07:55:29.000000000 +0100
@@ -4,13 +4,13 @@
 ECellRendererColor
-
-
+
+
-
+
@@ -19,7 +19,7 @@
 
-
+
-
+
-
+

 

 
source :
 an ESource to select
+ an ESource to select
 
 

 
 
 
 
 
 
 
 
 
 
Prev
 Up
 HomeEvolution API Reference: libedataserverui, graphical utility libraryEvolution-Data-Server Manual: Graphical Utilities (libedataserverui)
 Next
 

 

@@ -46,8 +46,12 @@
 
                     ESourceSelectorDialog;
 GtkWidget *         e_source_selector_dialog_new        (GtkWindow *parent,
-                                                         ESourceList *source_list);
-ESource *           e_source_selector_dialog_peek_primary_selection
+                                                         ESourceList *source_list);
+ESource *           e_source_selector_dialog_peek_primary_selection
                                                         (ESourceSelectorDialog *dialog);
 

 
@@ -88,7 +92,9 @@
 

 
e_source_selector_dialog_new ()

 
GtkWidget *         e_source_selector_dialog_new        (GtkWindow *parent,
-                                                         ESourceList *source_list);

+                                                         ESourceList *source_list);
 

 Create a new source selector dialog for the given list.

 

@@ -117,7 +123,9 @@
 

 

 
e_source_selector_dialog_peek_primary_selection ()

-
ESource *           e_source_selector_dialog_peek_primary_selection
+
ESource *           e_source_selector_dialog_peek_primary_selection
                                                         (ESourceSelectorDialog *dialog);

 

 Peek the currently selected source in the given dialog.

diff -Nru evolution-data-server-2.24.1/docs/reference/libedataserverui/html/ESourceSelector.html evolution-data-server-2.24.1.1/docs/reference/libedataserverui/html/ESourceSelector.html
--- evolution-data-server-2.24.1/docs/reference/libedataserverui/html/ESourceSelector.html	2008-10-20 10:11:20.000000000 +0200
+++ evolution-data-server-2.24.1.1/docs/reference/libedataserverui/html/ESourceSelector.html	2008-11-07 07:55:29.000000000 +0100
@@ -4,13 +4,13 @@
 
 ESourceSelector
 
-
-
+
+
 
 
 
 
-
+
 
 
 
@@ -19,7 +19,7 @@
 
Prev
 Up
 HomeEvolution API Reference: libedataserverui, graphical utility libraryEvolution-Data-Server Manual: Graphical Utilities (libedataserverui)
 Next
 

 

@@ -49,15 +49,25 @@
 
Synopsis

 
                     ESourceSelector;
-GtkWidget *         e_source_selector_new               (ESourceList *list);
-ESourceList *       e_source_selector_get_source_list   (ESourceSelector *selector);
+GtkWidget *         e_source_selector_new               (ESourceList *list);
+ESourceList *       e_source_selector_get_source_list   (ESourceSelector *selector);
 void                e_source_selector_select_source     (ESourceSelector *selector,
-                                                         ESource *source);
+                                                         ESource *source);
 void                e_source_selector_unselect_source   (ESourceSelector *selector,
-                                                         ESource *source);
+                                                         ESource *source);
 gboolean            e_source_selector_source_is_selected
                                                         (ESourceSelector *selector,
-                                                         ESource *source);
+                                                         ESource *source);
 GSList *            e_source_selector_get_selection     (ESourceSelector *selector);
 void                e_source_selector_free_selection    (GSList *list);
 void                e_source_selector_show_selection    (ESourceSelector *selector,
@@ -65,12 +75,18 @@
 gboolean            e_source_selector_selection_shown   (ESourceSelector *selector);
 void                e_source_selector_set_select_new    (ESourceSelector *selector,
                                                          gboolean state);
-ESource *           e_source_selector_peek_primary_selection
+ESource *           e_source_selector_peek_primary_selection
                                                         (ESourceSelector *selector);
 void                e_source_selector_set_primary_selection
                                                         (ESourceSelector *selector,
-                                                         ESource *source);
-ESourceGroup *      e_source_selector_get_primary_source_group
+                                                         ESource *source);
+ESourceGroup *      e_source_selector_get_primary_source_group
                                                         (ESourceSelector *selector);
 

 
@@ -95,7 +111,9 @@
 

 
Properties

 
-  "source-list"              ESourceList*          : Read / Write / Construct Only
+  "source-list"              ESourceList*          : Read / Write / Construct Only
 

 

 

@@ -122,7 +140,9 @@
 

 

 
e_source_selector_new ()

-
GtkWidget *         e_source_selector_new               (ESourceList *list);

+
GtkWidget *         e_source_selector_new               (ESourceList *list);

 

 Create a new view for list.  The view will update automatically when list
 changes.

@@ -147,9 +167,13 @@
 

 

 
e_source_selector_get_source_list ()

-
ESourceList *       e_source_selector_get_source_list   (ESourceSelector *selector);

-

-Returns the ESourceList that selector is rendering.

+
ESourceList *       e_source_selector_get_source_list   (ESourceSelector *selector);

+

+Returns the ESourceList that selector is rendering.

 

 

 

@@ -162,7 +186,9 @@
 
-
@@ -172,7 +198,9 @@
 

 
e_source_selector_select_source ()

 
void                e_source_selector_select_source     (ESourceSelector *selector,
-                                                         ESource *source);

+                                                         ESource *source);
 

 Select source in selector.

 

@@ -187,7 +215,9 @@
 
 

-
@@ -197,7 +227,9 @@
 

 
e_source_selector_unselect_source ()

 
void                e_source_selector_unselect_source   (ESourceSelector *selector,
-                                                         ESource *source);

+                                                         ESource *source);
 

 Unselect source in selector.

 

@@ -212,7 +244,9 @@
 
 

-
@@ -223,7 +257,9 @@
 
e_source_selector_source_is_selected ()
gboolean            e_source_selector_source_is_selected
                                                         (ESourceSelector *selector,
-                                                         ESource *source);

+                                                         ESource *source);

 Check whether source is selected in selector.

@@ -238,7 +274,9 @@
 
 

-
@@ -369,7 +407,9 @@
 

 
e_source_selector_peek_primary_selection ()

-
ESource *           e_source_selector_peek_primary_selection
+
ESource *           e_source_selector_peek_primary_selection
                                                         (ESourceSelector *selector);

 

 Get the primary selected source.  The primary selection is the one that is
@@ -399,7 +439,9 @@
 
e_source_selector_set_primary_selection ()

 
void                e_source_selector_set_primary_selection
                                                         (ESourceSelector *selector,
-                                                         ESource *source);

+                                                         ESource *source);

 

 Set the primary selected source.

 

@@ -414,7 +456,9 @@
 

-
@@ -423,7 +467,9 @@
 

 
e_source_selector_get_primary_source_group ()

-
ESourceGroup *      e_source_selector_get_primary_source_group
+
ESourceGroup *      e_source_selector_get_primary_source_group
                                                         (ESourceSelector *selector);

 

 Gets the primary source group associated with the selector.

@@ -450,7 +496,9 @@
 
Property Details

 

 
The "source-list" property

-
  "source-list"              ESourceList*          : Read / Write / Construct Only

+
  "source-list"              ESourceList*          : Read / Write / Construct Only

 

 

 

diff -Nru evolution-data-server-2.24.1/docs/reference/libedataserverui/html/ETreeModelGenerator.html evolution-data-server-2.24.1.1/docs/reference/libedataserverui/html/ETreeModelGenerator.html
--- evolution-data-server-2.24.1/docs/reference/libedataserverui/html/ETreeModelGenerator.html	2008-10-20 10:11:20.000000000 +0200
+++ evolution-data-server-2.24.1.1/docs/reference/libedataserverui/html/ETreeModelGenerator.html	2008-11-07 07:55:29.000000000 +0100
@@ -4,13 +4,13 @@
 ETreeModelGenerator
-
-
+
+
-
+
@@ -19,7 +19,7 @@
 
-
+
-
+

 

 
Returns :
 an ESourceList
+ an ESourceList
 
 

 

 
source :
 An ESource.
+ An ESource.
 
 

 

 
source :
 An ESource.
+ An ESource.
 
 

 
 
 
 

 
source :
 An ESource.
+ An ESource.
 
 

 

 

 

 
source :
 an ESource to select
+ an ESource to select
 
 

 
 
 
 
 
 
 
 
 
 
 
Prev
 Up
 HomeEvolution API Reference: libedataserverui, graphical utility libraryEvolution-Data-Server Manual: Graphical Utilities (libedataserverui)
 Next
 

 

diff -Nru evolution-data-server-2.24.1/docs/reference/libedataserverui/html/index.html evolution-data-server-2.24.1.1/docs/reference/libedataserverui/html/index.html
--- evolution-data-server-2.24.1/docs/reference/libedataserverui/html/index.html	2008-10-20 10:11:20.000000000 +0200
+++ evolution-data-server-2.24.1.1/docs/reference/libedataserverui/html/index.html	2008-11-07 07:55:29.000000000 +0100
@@ -2,23 +2,23 @@
 
 
 
-Evolution API Reference: libedataserverui, graphical utility library
+Evolution-Data-Server Manual: Graphical Utilities (libedataserverui)
 
-
-
+
+
 
 
-
+
 
 
 
 

 

-

+

 

 

 

-
Evolution API Reference: libedataserverui, graphical utility library

+
Evolution-Data-Server Manual: Graphical Utilities (libedataserverui)

 

 

 e-book-auth-util
diff -Nru evolution-data-server-2.24.1/docs/reference/libedataserverui/html/index.sgml evolution-data-server-2.24.1.1/docs/reference/libedataserverui/html/index.sgml
--- evolution-data-server-2.24.1/docs/reference/libedataserverui/html/index.sgml	2008-10-20 10:11:20.000000000 +0200
+++ evolution-data-server-2.24.1.1/docs/reference/libedataserverui/html/index.sgml	2008-11-07 07:55:29.000000000 +0100
@@ -88,6 +88,8 @@
 
 
 
+
+
 
 
 
@@ -96,6 +98,7 @@
 
 
 
+
 
 
 
diff -Nru evolution-data-server-2.24.1/docs/reference/libedataserverui/html/ix01.html evolution-data-server-2.24.1.1/docs/reference/libedataserverui/html/ix01.html
--- evolution-data-server-2.24.1/docs/reference/libedataserverui/html/ix01.html	2008-10-20 10:11:20.000000000 +0200
+++ evolution-data-server-2.24.1.1/docs/reference/libedataserverui/html/ix01.html	2008-11-07 07:55:29.000000000 +0100
@@ -4,12 +4,12 @@
 
 Index
 
-
-
+
+
 
 
 
-
+
 
 
 
@@ -17,7 +17,7 @@
 
Prev
  
 HomeEvolution API Reference: libedataserverui, graphical utility libraryEvolution-Data-Server Manual: Graphical Utilities (libedataserverui)
  
 

 

@@ -53,6 +53,8 @@
 
 
ENameSelectorModel::section-removed, The "section-removed" signal
 

+
ens_util_populate_user_query_fields, ens_util_populate_user_query_fields ()
+

 
EPasswordsRememberType, enum EPasswordsRememberType
 

 
ESourceComboBox, ESourceComboBox
@@ -273,14 +275,23 @@
 

 

 
F

-
find_contact_source_by_book_return_view, find_contact_source_by_book_return_view ()
-

+

+
find_contact_source_by_book_return_view, find_contact_source_by_book_return_view ()
+

+
FORCE_SHOW_ADDRESS, FORCE_SHOW_ADDRESS
+

+

 

 

 
M

 
MINIMUM_QUERY_LENGTH, MINIMUM_QUERY_LENGTH
 

 

+

+
U

+
USER_QUERY_FIELDS, USER_QUERY_FIELDS
+

+

 

 

 

diff -Nru evolution-data-server-2.24.1/docs/reference/libedataserverui/html/libedataserverui.devhelp evolution-data-server-2.24.1.1/docs/reference/libedataserverui/html/libedataserverui.devhelp
--- evolution-data-server-2.24.1/docs/reference/libedataserverui/html/libedataserverui.devhelp	2008-10-20 10:11:20.000000000 +0200
+++ evolution-data-server-2.24.1.1/docs/reference/libedataserverui/html/libedataserverui.devhelp	2008-11-07 07:55:29.000000000 +0100
@@ -1,8 +1,8 @@
 
 
-
+
   
-    
+    
       
       
       
@@ -66,6 +66,8 @@
     
     
     
+    
+    
     
     
     
@@ -74,6 +76,7 @@
     
     
     
+    
     
     
     
diff -Nru evolution-data-server-2.24.1/docs/reference/libedataserverui/html/libedataserverui.devhelp2 evolution-data-server-2.24.1.1/docs/reference/libedataserverui/html/libedataserverui.devhelp2
--- evolution-data-server-2.24.1/docs/reference/libedataserverui/html/libedataserverui.devhelp2	2008-10-20 10:11:20.000000000 +0200
+++ evolution-data-server-2.24.1.1/docs/reference/libedataserverui/html/libedataserverui.devhelp2	2008-11-07 07:55:29.000000000 +0100
@@ -1,8 +1,8 @@
 
 
-
+
   
-    
+    
       
       
       
@@ -66,6 +66,8 @@
     
     
     
+    
+    
     
     
     
@@ -74,6 +76,7 @@
     
     
     
+    
     
     
     
diff -Nru evolution-data-server-2.24.1/docs/reference/libedataserverui/html/libedataserverui-e-book-auth-util.html evolution-data-server-2.24.1.1/docs/reference/libedataserverui/html/libedataserverui-e-book-auth-util.html
--- evolution-data-server-2.24.1/docs/reference/libedataserverui/html/libedataserverui-e-book-auth-util.html	2008-10-20 10:11:20.000000000 +0200
+++ evolution-data-server-2.24.1.1/docs/reference/libedataserverui/html/libedataserverui-e-book-auth-util.html	2008-11-07 07:55:29.000000000 +0100
@@ -4,13 +4,13 @@
 
 e-book-auth-util
 
-
-
-
+
+
+
 
 
 
-
+
 
 
 
@@ -19,7 +19,7 @@
 
Prev
 Up
 HomeEvolution API Reference: libedataserverui, graphical utility libraryEvolution-Data-Server Manual: Graphical Utilities (libedataserverui)
 Next
 

 

@@ -40,8 +40,14 @@
 

 
Synopsis

 
-EBook *             e_load_book_source                  (ESource *source,
-                                                         EBookCallback open_func,
+EBook *             e_load_book_source                  (ESource *source,
+                                                         EBookCallback open_func,
                                                          gpointer user_data);
 

 

@@ -54,11 +60,19 @@
 
Details

 

 
e_load_book_source ()

-
EBook *             e_load_book_source                  (ESource *source,
-                                                         EBookCallback open_func,
+
EBook *             e_load_book_source                  (ESource *source,
+                                                         EBookCallback open_func,
                                                          gpointer user_data);

 

-Creates a new EBook specified by source, and starts a non-blocking
+Creates a new EBook specified by source, and starts a non-blocking
 open operation on it. If the book requires authorization, presents
 a window asking the user for such.
 

@@ -73,7 +87,9 @@
 

 

 
source :
 an ESource
+ an ESource
 
 

 

 

 
Returns :
 A new EBook that is being opened.
+ A new EBook that is being opened.
 
 

 
 
 
 
 
 
 
 
 
 
Prev
 Up
 HomeEvolution API Reference: libedataserverui, graphical utility libraryEvolution-Data-Server Manual: Graphical Utilities (libedataserverui)
 Next
 

 

diff -Nru evolution-data-server-2.24.1/docs/reference/libedataserverui/html/libedataserverui-e-data-server-ui-marshal.html evolution-data-server-2.24.1.1/docs/reference/libedataserverui/html/libedataserverui-e-data-server-ui-marshal.html
--- evolution-data-server-2.24.1/docs/reference/libedataserverui/html/libedataserverui-e-data-server-ui-marshal.html	2008-10-20 10:11:20.000000000 +0200
+++ evolution-data-server-2.24.1.1/docs/reference/libedataserverui/html/libedataserverui-e-data-server-ui-marshal.html	2008-11-07 07:55:29.000000000 +0100
@@ -4,13 +4,13 @@
 
 e-data-server-ui-marshal
 
-
-
+
+
 
 
 
 
-
+
 
 
 
@@ -19,7 +19,7 @@
 Prev
 Up
 HomeEvolution API Reference: libedataserverui, graphical utility libraryEvolution-Data-Server Manual: Graphical Utilities (libedataserverui)
 Next
 

 

diff -Nru evolution-data-server-2.24.1/docs/reference/libedataserverui/html/libedataserverui-e-passwords.html evolution-data-server-2.24.1.1/docs/reference/libedataserverui/html/libedataserverui-e-passwords.html
--- evolution-data-server-2.24.1/docs/reference/libedataserverui/html/libedataserverui-e-passwords.html	2008-10-20 10:11:20.000000000 +0200
+++ evolution-data-server-2.24.1.1/docs/reference/libedataserverui/html/libedataserverui-e-passwords.html	2008-11-07 07:55:29.000000000 +0100
@@ -4,13 +4,13 @@
 
 e-passwords
 
-
-
+
+
 
 
 
 
-
+
 
 
 
@@ -19,7 +19,7 @@
 Prev
 Up
 HomeEvolution API Reference: libedataserverui, graphical utility libraryEvolution-Data-Server Manual: Graphical Utilities (libedataserverui)
 Next
 

 

diff -Nru evolution-data-server-2.24.1/docs/reference/libedataserverui/libedataserverui-docs.sgml evolution-data-server-2.24.1.1/docs/reference/libedataserverui/libedataserverui-docs.sgml
--- evolution-data-server-2.24.1/docs/reference/libedataserverui/libedataserverui-docs.sgml	2008-10-13 10:08:06.000000000 +0200
+++ evolution-data-server-2.24.1.1/docs/reference/libedataserverui/libedataserverui-docs.sgml	2008-11-07 05:34:23.000000000 +0100
@@ -3,11 +3,11 @@
                "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd">
 
   
-    Evolution API Reference: libedataserverui, graphical utility library
+    Evolution-Data-Server Manual: Graphical Utilities (libedataserverui)
   
 
   
-    Evolution API Reference: libedataserverui, graphical utility library
+    Evolution-Data-Server Manual: Graphical Utilities (libedataserverui)
     
     
     
diff -Nru evolution-data-server-2.24.1/docs/reference/libedataserverui/libedataserverui-sections.txt evolution-data-server-2.24.1.1/docs/reference/libedataserverui/libedataserverui-sections.txt
--- evolution-data-server-2.24.1/docs/reference/libedataserverui/libedataserverui-sections.txt	2008-10-13 10:08:06.000000000 +0200
+++ evolution-data-server-2.24.1.1/docs/reference/libedataserverui/libedataserverui-sections.txt	2008-11-07 05:34:23.000000000 +0100
@@ -89,6 +89,8 @@
 e-name-selector-entry
 ENameSelectorEntry
 MINIMUM_QUERY_LENGTH
+FORCE_SHOW_ADDRESS
+USER_QUERY_FIELDS
 ENameSelectorEntry
 e_name_selector_entry_new
 e_name_selector_entry_peek_contact_store
@@ -97,6 +99,7 @@
 e_name_selector_entry_set_destination_store
 e_name_selector_entry_set_contact_editor_func
 e_name_selector_entry_set_contact_list_editor_func
+ens_util_populate_user_query_fields
 
 E_NAME_SELECTOR_ENTRY
 E_IS_NAME_SELECTOR_ENTRY
diff -Nru evolution-data-server-2.24.1/docs/reference/libedataserverui/tmpl/e-name-selector-entry.sgml evolution-data-server-2.24.1.1/docs/reference/libedataserverui/tmpl/e-name-selector-entry.sgml
--- evolution-data-server-2.24.1/docs/reference/libedataserverui/tmpl/e-name-selector-entry.sgml	2008-10-20 10:11:20.000000000 +0200
+++ evolution-data-server-2.24.1.1/docs/reference/libedataserverui/tmpl/e-name-selector-entry.sgml	2008-11-07 07:55:29.000000000 +0100
@@ -24,6 +24,20 @@
 
 
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 
 
@@ -100,3 +114,14 @@
 @func: 
 
 
+
+
+
+
+
+@user_query_fields: 
+@cue_str: 
+@encoded_cue_str: 
+@Returns: 
+
+
diff -Nru evolution-data-server-2.24.1/docs/reference/libedataserverui/tmpl/e-source-combo-box.sgml evolution-data-server-2.24.1.1/docs/reference/libedataserverui/tmpl/e-source-combo-box.sgml
--- evolution-data-server-2.24.1/docs/reference/libedataserverui/tmpl/e-source-combo-box.sgml	2008-10-20 10:11:20.000000000 +0200
+++ evolution-data-server-2.24.1.1/docs/reference/libedataserverui/tmpl/e-source-combo-box.sgml	2008-11-07 07:55:29.000000000 +0100
@@ -9,13 +9,11 @@
 
 
 
-
 
 
 
 
 
-
 
 
 
diff -Nru evolution-data-server-2.24.1/docs/reference/libedataserverui/xml/api-index-full.xml evolution-data-server-2.24.1.1/docs/reference/libedataserverui/xml/api-index-full.xml
--- evolution-data-server-2.24.1/docs/reference/libedataserverui/xml/api-index-full.xml	2008-10-20 10:11:20.000000000 +0200
+++ evolution-data-server-2.24.1.1/docs/reference/libedataserverui/xml/api-index-full.xml	2008-11-07 07:55:29.000000000 +0100
@@ -16,6 +16,7 @@
 ENameSelectorModel
 ENameSelectorModel::section-added
 ENameSelectorModel::section-removed
+ens_util_populate_user_query_fields
 EPasswordsRememberType
 ESourceComboBox
 ESourceComboBox:source-list
@@ -127,8 +128,12 @@
 
 F
 find_contact_source_by_book_return_view
+FORCE_SHOW_ADDRESS
 
 M
 MINIMUM_QUERY_LENGTH
 
+U
+USER_QUERY_FIELDS
+
 
diff -Nru evolution-data-server-2.24.1/docs/reference/libedataserverui/xml/e-name-selector-entry.xml evolution-data-server-2.24.1.1/docs/reference/libedataserverui/xml/e-name-selector-entry.xml
--- evolution-data-server-2.24.1/docs/reference/libedataserverui/xml/e-name-selector-entry.xml	2008-10-20 10:11:20.000000000 +0200
+++ evolution-data-server-2.24.1.1/docs/reference/libedataserverui/xml/e-name-selector-entry.xml	2008-11-07 07:55:29.000000000 +0100
@@ -18,6 +18,8 @@
 
 
 #define             MINIMUM_QUERY_LENGTH
+#define             FORCE_SHOW_ADDRESS
+#define             USER_QUERY_FIELDS
                     ENameSelectorEntry;
 ENameSelectorEntry * e_name_selector_entry_new          (void);
 EContactStore *     e_name_selector_entry_peek_contact_store
@@ -36,6 +38,9 @@
 void                e_name_selector_entry_set_contact_list_editor_func
                                                         (ENameSelectorEntry *name_selector_entry,
                                                          gpointer func);
+gchar *             ens_util_populate_user_query_fields (GSList *user_query_fields,
+                                                         const char *cue_str,
+                                                         const char *encoded_cue_str);
 
 
 
@@ -85,6 +90,18 @@
 
 
 
+
+FORCE_SHOW_ADDRESS
+FORCE_SHOW_ADDRESS#define FORCE_SHOW_ADDRESS   "/apps/evolution/addressbook/completion/show_address"
+
+
+
+
+USER_QUERY_FIELDS
+USER_QUERY_FIELDS#define USER_QUERY_FIELDS "/apps/evolution/addressbook/completion/user_query_fields"
+
+
+
 
 ENameSelectorEntry
 ENameSelectorEntrytypedef struct _ENameSelectorEntry ENameSelectorEntry;
@@ -193,6 +210,27 @@
 
 
 
+
+ens_util_populate_user_query_fields ()
+ens_util_populate_user_query_fieldsgchar *             ens_util_populate_user_query_fields (GSList *user_query_fields,
+                                                         const char *cue_str,
+                                                         const char *encoded_cue_str);
+
+
+
+
+user_query_fields :
+
+
+cue_str :
+
+
+encoded_cue_str :
+
+
+Returns :
+
+
 
 
 
diff -Nru evolution-data-server-2.24.1/libdb/dist/config.log evolution-data-server-2.24.1.1/libdb/dist/config.log
--- evolution-data-server-2.24.1/libdb/dist/config.log	2008-10-20 05:33:42.000000000 +0200
+++ evolution-data-server-2.24.1.1/libdb/dist/config.log	2008-11-07 06:18:19.000000000 +0100
@@ -182,7 +182,7 @@
 configure:3936: result: none needed
 configure:3954: icecc -c -g -O2 -Wl,--allow-shlib-undefined -fgnu89-inline  -D_GNU_SOURCE -D_REENTRANT conftest.c >&5
 conftest.c:2: error: expected '=', ',', ';', 'asm' or '__attribute__' before 'me'
-ICECC[6032] 09:03:33: Compiled on 164.99.138.188
+ICECC[30760] 10:48:10: Compiled on 164.99.138.188
 configure:3957: $? = 1
 configure: failed program was:
 | #ifndef __cplusplus
@@ -1139,7 +1139,7 @@
 configure:17317: error: (Each undeclared identifier is reported only once
 configure:17317: error: for each function it appears in.)
 configure:17317: error: expected ';' before 'TO'
-ICECC[7615] 09:03:38: Compiled on 164.99.138.188
+ICECC[32347] 10:48:15: Compiled on 164.99.138.188
 configure:17300: $? = 1
 configure: failed program was:
 | #line 17274 "configure"
@@ -1376,7 +1376,7 @@
 configure:17550: error: (Each undeclared identifier is reported only once
 configure:17550: error: for each function it appears in.)
 configure:17550: error: expected ';' before 'TO'
-ICECC[7663] 09:03:38: Compiled on 164.99.138.188
+ICECC[32395] 10:48:15: Compiled on 164.99.138.188
 configure:17533: $? = 1
 configure: failed program was:
 | #line 17507 "configure"
@@ -1435,7 +1435,7 @@
 configure:17595: error: (Each undeclared identifier is reported only once
 configure:17595: error: for each function it appears in.)
 configure:17595: error: expected ';' before 'TO'
-ICECC[7675] 09:03:38: Compiled on 164.99.138.188
+ICECC[32407] 10:48:15: Compiled on 164.99.138.188
 configure:17578: $? = 1
 configure: failed program was:
 | #line 17552 "configure"
@@ -1494,7 +1494,7 @@
 configure:17640: error: (Each undeclared identifier is reported only once
 configure:17640: error: for each function it appears in.)
 configure:17640: error: expected ';' before 'TO'
-ICECC[7687] 09:03:38: Compiled on 164.99.138.188
+ICECC[32419] 10:48:15: Compiled on 164.99.138.188
 configure:17623: $? = 1
 configure: failed program was:
 | #line 17597 "configure"
@@ -1553,7 +1553,7 @@
 configure:17685: error: (Each undeclared identifier is reported only once
 configure:17685: error: for each function it appears in.)
 configure:17685: error: expected ';' before 'TO'
-ICECC[7699] 09:03:38: Compiled on 164.99.138.188
+ICECC[32431] 10:48:15: Compiled on 164.99.138.188
 configure:17668: $? = 1
 configure: failed program was:
 | #line 17642 "configure"
@@ -1612,7 +1612,7 @@
 configure:17731: error: (Each undeclared identifier is reported only once
 configure:17731: error: for each function it appears in.)
 configure:17731: error: expected ';' before 'TO'
-ICECC[7711] 09:03:38: Compiled on 164.99.138.188
+ICECC[32443] 10:48:15: Compiled on 164.99.138.188
 configure:17714: $? = 1
 configure: failed program was:
 | #line 17688 "configure"
@@ -1671,7 +1671,7 @@
 configure:17774: error: (Each undeclared identifier is reported only once
 configure:17774: error: for each function it appears in.)
 configure:17774: error: expected ';' before 'TO'
-ICECC[7723] 09:03:38: Compiled on 164.99.138.188
+ICECC[32455] 10:48:15: Compiled on 164.99.138.188
 configure:17757: $? = 1
 configure: failed program was:
 | #line 17731 "configure"
@@ -1730,7 +1730,7 @@
 configure:17819: error: (Each undeclared identifier is reported only once
 configure:17819: error: for each function it appears in.)
 configure:17819: error: expected ';' before 'TO'
-ICECC[7735] 09:03:38: Compiled on 164.99.138.188
+ICECC[32467] 10:48:15: Compiled on 164.99.138.188
 configure:17802: $? = 1
 configure: failed program was:
 | #line 17776 "configure"
@@ -1789,7 +1789,7 @@
 configure:17864: error: (Each undeclared identifier is reported only once
 configure:17864: error: for each function it appears in.)
 configure:17864: error: expected ';' before 'TO'
-ICECC[7747] 09:03:38: Compiled on 164.99.138.188
+ICECC[32479] 10:48:15: Compiled on 164.99.138.188
 configure:17847: $? = 1
 configure: failed program was:
 | #line 17821 "configure"
@@ -1924,9 +1924,9 @@
 configure:18798: result: yes
 configure:18821: checking for _fstati64
 configure:18871: icecc -o conftest -g -O2 -Wl,--allow-shlib-undefined -fgnu89-inline  -D_GNU_SOURCE -D_REENTRANT -L/home/stable/opt/gnome/lib  conftest.c  >&5
-/tmp/cc2gbrU6.o: In function `main':
+/tmp/ccC2uZVY.o: In function `main':
 /home/stable/svn/gnome/evolution-data-server/libdb/dist/configure:18905: undefined reference to `_fstati64'
-/tmp/cc2gbrU6.o:(.data+0x0): undefined reference to `_fstati64'
+/tmp/ccC2uZVY.o:(.data+0x0): undefined reference to `_fstati64'
 collect2: ld returned 1 exit status
 configure:18874: $? = 1
 configure: failed program was:
@@ -2018,9 +2018,9 @@
 configure:18891: result: no
 configure:18821: checking for clock_gettime
 configure:18871: icecc -o conftest -g -O2 -Wl,--allow-shlib-undefined -fgnu89-inline  -D_GNU_SOURCE -D_REENTRANT -L/home/stable/opt/gnome/lib  conftest.c  >&5
-/tmp/cce27rBc.o: In function `main':
+/tmp/cc2u7jhe.o: In function `main':
 /home/stable/svn/gnome/evolution-data-server/libdb/dist/configure:18905: undefined reference to `clock_gettime'
-/tmp/cce27rBc.o:(.data+0x0): undefined reference to `clock_gettime'
+/tmp/cc2u7jhe.o:(.data+0x0): undefined reference to `clock_gettime'
 collect2: ld returned 1 exit status
 configure:18874: $? = 1
 configure: failed program was:
@@ -2112,9 +2112,9 @@
 configure:18891: result: no
 configure:18821: checking for directio
 configure:18871: icecc -o conftest -g -O2 -Wl,--allow-shlib-undefined -fgnu89-inline  -D_GNU_SOURCE -D_REENTRANT -L/home/stable/opt/gnome/lib  conftest.c  >&5
-/tmp/cc6uMtem.o: In function `main':
+/tmp/ccKa6uqp.o: In function `main':
 /home/stable/svn/gnome/evolution-data-server/libdb/dist/configure:18905: undefined reference to `directio'
-/tmp/cc6uMtem.o:(.data+0x0): undefined reference to `directio'
+/tmp/ccKa6uqp.o:(.data+0x0): undefined reference to `directio'
 collect2: ld returned 1 exit status
 configure:18874: $? = 1
 configure: failed program was:
@@ -2218,9 +2218,9 @@
 configure:18891: result: yes
 configure:18910: checking for pstat_getdynamic
 configure:18960: icecc -o conftest -g -O2 -Wl,--allow-shlib-undefined -fgnu89-inline  -D_GNU_SOURCE -D_REENTRANT -L/home/stable/opt/gnome/lib  conftest.c  >&5
-/tmp/ccgubCez.o: In function `main':
+/tmp/ccKob5SX.o: In function `main':
 /home/stable/svn/gnome/evolution-data-server/libdb/dist/configure:18996: undefined reference to `pstat_getdynamic'
-/tmp/ccgubCez.o:(.data+0x0): undefined reference to `pstat_getdynamic'
+/tmp/ccKob5SX.o:(.data+0x0): undefined reference to `pstat_getdynamic'
 collect2: ld returned 1 exit status
 configure:18963: $? = 1
 configure: failed program was:
@@ -2334,9 +2334,9 @@
 configure:18980: result: yes
 configure:18910: checking for yield
 configure:18960: icecc -o conftest -g -O2 -Wl,--allow-shlib-undefined -fgnu89-inline  -D_GNU_SOURCE -D_REENTRANT -L/home/stable/opt/gnome/lib  conftest.c  >&5
-/tmp/ccGZmHOf.o: In function `main':
+/tmp/cckiL56z.o: In function `main':
 /home/stable/svn/gnome/evolution-data-server/libdb/dist/configure:19000: undefined reference to `yield'
-/tmp/ccGZmHOf.o:(.data+0x0): undefined reference to `yield'
+/tmp/cckiL56z.o:(.data+0x0): undefined reference to `yield'
 collect2: ld returned 1 exit status
 configure:18963: $? = 1
 configure: failed program was:
@@ -2539,7 +2539,7 @@
 configure:19504: warning: left shift count >= width of type
 configure:19504: warning: left shift count >= width of type
 configure:19506: error: size of array 'off_t_is_large' is negative
-ICECC[8446] 09:03:40: Compiled on 164.99.138.188
+ICECC[709] 10:48:17: Compiled on 164.99.138.188
 configure:19468: $? = 1
 configure: failed program was:
 | #line 19440 "configure"
diff -Nru evolution-data-server-2.24.1/libebackend/e-data-server-module.c evolution-data-server-2.24.1.1/libebackend/e-data-server-module.c
--- evolution-data-server-2.24.1/libebackend/e-data-server-module.c	2008-10-13 10:07:53.000000000 +0200
+++ evolution-data-server-2.24.1.1/libebackend/e-data-server-module.c	2008-11-07 05:34:23.000000000 +0100
@@ -77,7 +77,7 @@
 	module->library = g_module_open (module->path, G_MODULE_BIND_LAZY);
 
 	if (!module->library) {
-		g_warning (g_module_error ());
+		g_warning ("%s", g_module_error ());
 		return FALSE;
 	}
 
@@ -91,7 +91,7 @@
 			      "eds_module_list_types",
 			      (gpointer *)&module->list_types)) {
 
-		g_warning (g_module_error ());
+		g_warning ("%s", g_module_error ());
 		g_module_close (module->library);
 
 		return FALSE;
diff -Nru evolution-data-server-2.24.1/libedataserver/eds-version.h evolution-data-server-2.24.1.1/libedataserver/eds-version.h
--- evolution-data-server-2.24.1/libedataserver/eds-version.h	2008-10-20 05:33:21.000000000 +0200
+++ evolution-data-server-2.24.1.1/libedataserver/eds-version.h	2008-11-07 06:17:58.000000000 +0100
@@ -50,7 +50,7 @@
  * time, rather than from the library linked against at application run
  * time.
  **/
-#define EDS_MICRO_VERSION 1
+#define EDS_MICRO_VERSION 1.1
 
 /**
  * EDS_CHECK_VERSION:
diff -Nru evolution-data-server-2.24.1/libedataserver/e-proxy.c evolution-data-server-2.24.1.1/libedataserver/e-proxy.c
--- evolution-data-server-2.24.1/libedataserver/e-proxy.c	2008-10-13 10:08:18.000000000 +0200
+++ evolution-data-server-2.24.1.1/libedataserver/e-proxy.c	2008-11-07 05:34:23.000000000 +0100
@@ -1,27 +1,26 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- *  Authors: Jeffrey Stedfast 
- *	     Veerapuram Varadhan 
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) version 3.
  *
- *  Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
  *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with the program; if not, see   
  *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
  *
- *  You should have 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.
+ * Authors:
+ *		Jeffrey Stedfast 
+ *		Veerapuram Varadhan 
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
  */
 
-
 #ifdef HAVE_CONFIG_H
 #include 
 #endif
diff -Nru evolution-data-server-2.24.1/libedataserver/e-proxy.h evolution-data-server-2.24.1.1/libedataserver/e-proxy.h
--- evolution-data-server-2.24.1/libedataserver/e-proxy.h	2008-10-13 10:08:18.000000000 +0200
+++ evolution-data-server-2.24.1.1/libedataserver/e-proxy.h	2008-11-07 05:34:23.000000000 +0100
@@ -1,27 +1,26 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- *  Authors: Jeffrey Stedfast 
- *	     Veerapuram Varadhan 
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) version 3.
  *
- *  Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
  *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have 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.
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with the program; if not, see   
+ *
+ *
+ * Authors:
+ *		Jeffrey Stedfast 
+ *		Veerapuram Varadhan 
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
  */
 
-
 #ifndef __E_PROXY_H__
 #define __E_PROXY_H__
 
diff -Nru evolution-data-server-2.24.1/libedataserverui/ChangeLog evolution-data-server-2.24.1.1/libedataserverui/ChangeLog
--- evolution-data-server-2.24.1/libedataserverui/ChangeLog	2008-10-13 10:08:16.000000000 +0200
+++ evolution-data-server-2.24.1.1/libedataserverui/ChangeLog	2008-11-07 05:34:23.000000000 +0100
@@ -1,3 +1,10 @@
+2008-11-03  Sankar P  
+
+License Changes
+
+	* e-name-selector-list.c:
+	* e-name-selector-list.h:
+
 2008-10-06  Srinivasa Ragavan  
 
 	** Fix for bug #546406
diff -Nru evolution-data-server-2.24.1/libedataserverui/e-name-selector-list.c evolution-data-server-2.24.1.1/libedataserverui/e-name-selector-list.c
--- evolution-data-server-2.24.1/libedataserverui/e-name-selector-list.c	2008-10-13 10:08:16.000000000 +0200
+++ evolution-data-server-2.24.1.1/libedataserverui/e-name-selector-list.c	2008-11-07 05:34:23.000000000 +0100
@@ -1,25 +1,26 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/* e-name-selector-list.c - Single-line text entry widget for EDestinations.
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+/*
+ * Single-line text entry widget for EDestinations.
  *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) version 3.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with the program; if not, see   
  *
- * 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., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
  *
- * Authors: Srinivasa Ragavan 
- * 	  : Devashish Sharma  
+ * Authors:
+ *		Srinivasa Ragavan 
+ *		Devashish Sharma  
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ *
  */
 
 #include 
diff -Nru evolution-data-server-2.24.1/libedataserverui/e-name-selector-list.h evolution-data-server-2.24.1.1/libedataserverui/e-name-selector-list.h
--- evolution-data-server-2.24.1/libedataserverui/e-name-selector-list.h	2008-10-13 10:08:16.000000000 +0200
+++ evolution-data-server-2.24.1.1/libedataserverui/e-name-selector-list.h	2008-11-07 05:34:23.000000000 +0100
@@ -1,24 +1,25 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/* e-name-selector-list.h - Single-line text entry widget for EDestinations.
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+/*
+ * Single-line text entry widget for EDestinations.
  *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) version 3.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with the program; if not, see   
  *
- * 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., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
  *
- * Authors: Srinivasa Ragavan 
+ * Authors:
+ *		Srinivasa Ragavan 
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ *
  */
 
 #ifndef E_NAME_SELECTOR_LIST_H
diff -Nru evolution-data-server-2.24.1/NEWS evolution-data-server-2.24.1.1/NEWS
--- evolution-data-server-2.24.1/NEWS	2008-10-20 10:05:07.000000000 +0200
+++ evolution-data-server-2.24.1.1/NEWS	2008-11-07 07:54:14.000000000 +0100
@@ -1,3 +1,26 @@
+Evolution-Data-Server 2.24.1.1 2008-11-07
+-----------------------------------------
+
+Bug Fixes:
+	#209514: (Novell Bugzilla) Evolution Groupwise missing mails (Sankar P)
+	#372382: (Novell Bugzilla) VUL-0: OTRS SOAP interface vulnerability (Sankar P)
+	#434946: (Novell Bugzilla) Deleted Messages in Trash Show Bold and Behave Like New Messages (Sankar P)
+	#434950: (Novell Bugzilla) Newly Fetched Mail Doesn't Update Mailbox Count in QuickViewer Until Exit and Entry (Sankar P)
+	#434958: (Novell Bugzilla) 'Empty Trash' Sometimes Requires Multiple Attempts Before Initiating (Sankar P)
+	#435725: (Novell Bugzilla) Disable Right-Mouse "Delete" On GrouPWise System Email Folders (Sankar P)
+	#435727: (Novell Bugzilla) Deleted Shared Folder Crashes Evolution (Sankar P)
+	#435964: (Novell Bugzilla) Evo crashed after switching from offline to online in GW addressbook (Ashish Shrivastava)
+	#440502: (Novell Bugzilla) Tracker Bug: GroupWise Magic Patch Tracker (Sankar P)
+	#532136: Evolution crashed - modifying a local task and changed offline state (Milan Crha)
+	#555979: Evolution does not empty trash on exit (Milan Crha)
+	#556119: Takes a very long time to index newsgroup. (Srinivasa Ragavan)
+	#558727: Format string bugs causing potential crashes (Matthew Barnes)
+	#558737: Evolution freezes on trying to store folder (Milan Crha)
+	#558883: Evolution 2.24 is terribly slow with large IMAP folders. (Srinivasa Ragavan)
+
+Updated Translations:
+	Maxim Dziumanenko (uk)
+
 Evolution-Data-Server 2.24.1 2008-10-20
 ---------------------------------------
 
diff -Nru evolution-data-server-2.24.1/po/ChangeLog evolution-data-server-2.24.1.1/po/ChangeLog
--- evolution-data-server-2.24.1/po/ChangeLog	2008-10-20 05:28:11.000000000 +0200
+++ evolution-data-server-2.24.1.1/po/ChangeLog	2008-11-07 05:34:24.000000000 +0100
@@ -1,3 +1,7 @@
+2008-11-03 Maxim Dziumanenko 
+
+	* uk.po: Update Ukrainian translation.
+
 2008-10-19  Djihed Afifi  
 
 	* ar.po: Updated Arabic Translation by Anas Afif Emad.
diff -Nru evolution-data-server-2.24.1/po/uk.po evolution-data-server-2.24.1.1/po/uk.po
--- evolution-data-server-2.24.1/po/uk.po	2008-10-13 10:11:18.000000000 +0200
+++ evolution-data-server-2.24.1.1/po/uk.po	2008-11-07 05:34:24.000000000 +0100
@@ -9,71 +9,71 @@
 msgstr ""
 "Project-Id-Version: evolution-data-server\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-03-07 13:58+0200\n"
-"PO-Revision-Date: 2008-03-07 22:39+0300\n"
+"POT-Creation-Date: 2008-11-03 14:14+0000\n"
+"PO-Revision-Date: 2008-11-02 22:39+0300\n"
 "Last-Translator: Maxim V. Dziumanenko \n"
 "Language-Team: Ukrainian \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../addressbook/backends/file/e-book-backend-file.c:554
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2317
+#: ../addressbook/backends/file/e-book-backend-file.c:560
+#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2367
 #: ../addressbook/backends/vcf/e-book-backend-vcf.c:475
 msgid "Loading..."
 msgstr "Завантаження..."
 
-#: ../addressbook/backends/file/e-book-backend-file.c:557
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2276
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2296
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2315
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4169
+#: ../addressbook/backends/file/e-book-backend-file.c:563
+#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2298
+#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2320
+#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2365
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4288
 #: ../addressbook/backends/vcf/e-book-backend-vcf.c:477
 msgid "Searching..."
 msgstr "Пошук..."
 
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2677
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4328
+#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2735
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4452
 #, c-format
 msgid "Downloading contacts (%d)... "
 msgstr "Завантаження контактів (%d)... "
 
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2832
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:3023
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:3067
+#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2884
+#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:3069
+#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:3113
 #, c-format
 msgid "Updating contacts cache (%d)... "
 msgstr "Оновлення кешу контактів (%d)... "
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:742
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:751
 msgid "Using Distinguished Name (DN)"
 msgstr "Використовуючи відокремлене ім'я (DN)"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:745
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:754
 msgid "Using Email Address"
 msgstr "Електронна адреса"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1002
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1019
 msgid "Reconnecting to LDAP server..."
 msgstr "Повторне з'єднання із сервером LDAP..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1598
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1617
 msgid "Adding contact to LDAP server..."
 msgstr "Додавання контакту до сервера LDAP..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1726
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1752
 msgid "Removing contact from LDAP server..."
 msgstr "Видалення контакту із сервера LDAP..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2031
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2064
 msgid "Modifying contact from LDAP server..."
 msgstr "Зміна контакту на сервері LDAP..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4040
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4148
 msgid "Receiving LDAP search results..."
 msgstr "Отримання результатів пошуку з сервера LDAP..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4189
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4310
 msgid "Error performing search"
 msgstr "Помилка виконання пошуку"
 
@@ -81,107 +81,107 @@
 #. * function names, e.g.
 #. * "e_book_add_contact" on book before
 #. * "e_book_open
-#: ../addressbook/libebook/e-book.c:254 ../addressbook/libebook/e-book.c:258
-#: ../addressbook/libebook/e-book.c:470 ../addressbook/libebook/e-book.c:474
-#: ../addressbook/libebook/e-book.c:615 ../addressbook/libebook/e-book.c:619
-#: ../addressbook/libebook/e-book.c:708 ../addressbook/libebook/e-book.c:712
-#: ../addressbook/libebook/e-book.c:1022 ../addressbook/libebook/e-book.c:1027
-#: ../addressbook/libebook/e-book.c:1214 ../addressbook/libebook/e-book.c:1218
-#: ../addressbook/libebook/e-book.c:1375 ../addressbook/libebook/e-book.c:1379
-#: ../addressbook/libebook/e-book.c:1588 ../addressbook/libebook/e-book.c:1592
-#: ../addressbook/libebook/e-book.c:1833 ../addressbook/libebook/e-book.c:1837
-#: ../addressbook/libebook/e-book.c:2078 ../addressbook/libebook/e-book.c:2082
-#: ../addressbook/libebook/e-book.c:2294 ../addressbook/libebook/e-book.c:2298
-#: ../addressbook/libebook/e-book.c:3433
+#: ../addressbook/libebook/e-book.c:253 ../addressbook/libebook/e-book.c:257
+#: ../addressbook/libebook/e-book.c:462 ../addressbook/libebook/e-book.c:466
+#: ../addressbook/libebook/e-book.c:605 ../addressbook/libebook/e-book.c:609
+#: ../addressbook/libebook/e-book.c:696 ../addressbook/libebook/e-book.c:700
+#: ../addressbook/libebook/e-book.c:996 ../addressbook/libebook/e-book.c:1001
+#: ../addressbook/libebook/e-book.c:1180 ../addressbook/libebook/e-book.c:1184
+#: ../addressbook/libebook/e-book.c:1339 ../addressbook/libebook/e-book.c:1343
+#: ../addressbook/libebook/e-book.c:1545 ../addressbook/libebook/e-book.c:1549
+#: ../addressbook/libebook/e-book.c:1788 ../addressbook/libebook/e-book.c:1792
+#: ../addressbook/libebook/e-book.c:2026 ../addressbook/libebook/e-book.c:2030
+#: ../addressbook/libebook/e-book.c:2235 ../addressbook/libebook/e-book.c:2239
+#: ../addressbook/libebook/e-book.c:3398
 #, c-format
 msgid "\"%s\" on book before \"%s\""
 msgstr "\"%s\" у книзі перед \"%s\""
 
-#: ../addressbook/libebook/e-book.c:267 ../addressbook/libebook/e-book.c:483
-#: ../addressbook/libebook/e-book.c:628 ../addressbook/libebook/e-book.c:721
-#: ../addressbook/libebook/e-book.c:1037 ../addressbook/libebook/e-book.c:1228
-#: ../addressbook/libebook/e-book.c:1389 ../addressbook/libebook/e-book.c:1601
-#: ../addressbook/libebook/e-book.c:1846 ../addressbook/libebook/e-book.c:2092
-#: ../addressbook/libebook/e-book.c:2307 ../addressbook/libebook/e-book.c:2673
-#: ../addressbook/libebook/e-book.c:2879
+#: ../addressbook/libebook/e-book.c:266 ../addressbook/libebook/e-book.c:475
+#: ../addressbook/libebook/e-book.c:618 ../addressbook/libebook/e-book.c:709
+#: ../addressbook/libebook/e-book.c:1011 ../addressbook/libebook/e-book.c:1194
+#: ../addressbook/libebook/e-book.c:1353 ../addressbook/libebook/e-book.c:1558
+#: ../addressbook/libebook/e-book.c:1801 ../addressbook/libebook/e-book.c:2040
+#: ../addressbook/libebook/e-book.c:2248 ../addressbook/libebook/e-book.c:2627
+#: ../addressbook/libebook/e-book.c:2826
 #, c-format
 msgid "book busy"
 msgstr "книга зайнята"
 
-#: ../addressbook/libebook/e-book.c:300 ../addressbook/libebook/e-book.c:304
-#: ../addressbook/libebook/e-book.c:516 ../addressbook/libebook/e-book.c:520
-#: ../addressbook/libebook/e-book.c:657 ../addressbook/libebook/e-book.c:661
-#: ../addressbook/libebook/e-book.c:750 ../addressbook/libebook/e-book.c:754
-#: ../addressbook/libebook/e-book.c:1066 ../addressbook/libebook/e-book.c:1069
-#: ../addressbook/libebook/e-book.c:1260 ../addressbook/libebook/e-book.c:1263
-#: ../addressbook/libebook/e-book.c:1418 ../addressbook/libebook/e-book.c:1422
-#: ../addressbook/libebook/e-book.c:1639 ../addressbook/libebook/e-book.c:1643
-#: ../addressbook/libebook/e-book.c:1895 ../addressbook/libebook/e-book.c:1899
-#: ../addressbook/libebook/e-book.c:2124 ../addressbook/libebook/e-book.c:2128
-#: ../addressbook/libebook/e-book.c:2335 ../addressbook/libebook/e-book.c:2339
-#: ../addressbook/libebook/e-book.c:2614 ../addressbook/libebook/e-book.c:2701
-#: ../addressbook/libebook/e-book.c:2705 ../addressbook/libebook/e-book.c:2907
-#: ../addressbook/libebook/e-book.c:2911 ../addressbook/libebook/e-book.c:3442
+#: ../addressbook/libebook/e-book.c:297 ../addressbook/libebook/e-book.c:301
+#: ../addressbook/libebook/e-book.c:506 ../addressbook/libebook/e-book.c:510
+#: ../addressbook/libebook/e-book.c:645 ../addressbook/libebook/e-book.c:649
+#: ../addressbook/libebook/e-book.c:736 ../addressbook/libebook/e-book.c:740
+#: ../addressbook/libebook/e-book.c:1038 ../addressbook/libebook/e-book.c:1041
+#: ../addressbook/libebook/e-book.c:1224 ../addressbook/libebook/e-book.c:1227
+#: ../addressbook/libebook/e-book.c:1380 ../addressbook/libebook/e-book.c:1384
+#: ../addressbook/libebook/e-book.c:1594 ../addressbook/libebook/e-book.c:1598
+#: ../addressbook/libebook/e-book.c:1848 ../addressbook/libebook/e-book.c:1852
+#: ../addressbook/libebook/e-book.c:2070 ../addressbook/libebook/e-book.c:2074
+#: ../addressbook/libebook/e-book.c:2274 ../addressbook/libebook/e-book.c:2278
+#: ../addressbook/libebook/e-book.c:2511 ../addressbook/libebook/e-book.c:2653
+#: ../addressbook/libebook/e-book.c:2657 ../addressbook/libebook/e-book.c:2852
+#: ../addressbook/libebook/e-book.c:2856 ../addressbook/libebook/e-book.c:3407
 #, c-format
 msgid "CORBA exception making \"%s\" call"
 msgstr "система CORBA робить виклик \"%s\""
 
-#: ../addressbook/libebook/e-book.c:2595
+#: ../addressbook/libebook/e-book.c:2500
 #, c-format
 msgid "%s: there is no current operation"
 msgstr "%s: немає поточної операції"
 
-#: ../addressbook/libebook/e-book.c:2630
+#: ../addressbook/libebook/e-book.c:2525
 #, c-format
 msgid "%s: could not cancel"
 msgstr "%s: неможливо скасувати"
 
-#: ../addressbook/libebook/e-book.c:2659 ../addressbook/libebook/e-book.c:2663
+#: ../addressbook/libebook/e-book.c:2613 ../addressbook/libebook/e-book.c:2617
 #, c-format
 msgid "\"%s\" on book after \"%s\""
 msgstr "\"%s\" у книзі після \"%s\""
 
-#: ../addressbook/libebook/e-book.c:2729
+#: ../addressbook/libebook/e-book.c:2681
 #, c-format
 msgid "%s: canceled"
 msgstr "%s: скасовано"
 
-#: ../addressbook/libebook/e-book.c:3297
+#: ../addressbook/libebook/e-book.c:3262
 #, c-format
 msgid "%s: Invalid source."
 msgstr "%s: неправильне джерело."
 
-#: ../addressbook/libebook/e-book.c:3305 ../addressbook/libebook/e-book.c:3371
+#: ../addressbook/libebook/e-book.c:3270 ../addressbook/libebook/e-book.c:3336
 #, c-format
 msgid "%s: no factories available for URI `%s'"
 msgstr "%s: немає доступних фабрик для URI `%s'"
 
-#: ../addressbook/libebook/e-book.c:3317
+#: ../addressbook/libebook/e-book.c:3282
 #, c-format
 msgid "%s: Could not create EBookListener"
 msgstr "%s: не вдається створити EBookListener"
 
-#: ../addressbook/libebook/e-book.c:3584
+#: ../addressbook/libebook/e-book.c:3549
 #, c-format
 msgid "%s: there was no self contact UID stored in gconf"
 msgstr "%s: UID власного контакту не був збережений у gconf"
 
-#: ../addressbook/libebook/e-book.c:3717
+#: ../addressbook/libebook/e-book.c:3682
 #, c-format
 msgid "%s: there was no source for uid `%s' stored in gconf."
 msgstr "%s: джерело для uid `%s' не було збережено у gconf."
 
 #. Dummy row as EContactField starts from 1
-#: ../addressbook/libebook/e-contact.c:114
+#: ../addressbook/libebook/e-contact.c:113
 msgid "Unique ID"
 msgstr "Унікальний ідентифікатор"
 
-#: ../addressbook/libebook/e-contact.c:115
+#: ../addressbook/libebook/e-contact.c:114
 msgid "File Under"
 msgstr "Зберегти у"
 
 #. URI of the book to which the contact belongs to
-#: ../addressbook/libebook/e-contact.c:117
+#: ../addressbook/libebook/e-contact.c:116
 msgid "Book URI"
 msgstr "URI книги"
 
@@ -189,535 +189,540 @@
 #. FN isn't really a structured field - we use a getter/setter
 #. so we can set the N property (since evo 1.4 works fine with
 #. vcards that don't even have a N attribute.  *sigh*)
-#: ../addressbook/libebook/e-contact.c:123
+#: ../addressbook/libebook/e-contact.c:122
 msgid "Full Name"
 msgstr "Повне ім'я"
 
-#: ../addressbook/libebook/e-contact.c:124
+#: ../addressbook/libebook/e-contact.c:123
 msgid "Given Name"
 msgstr "Назва поля"
 
-#: ../addressbook/libebook/e-contact.c:125
+#: ../addressbook/libebook/e-contact.c:124
 msgid "Family Name"
 msgstr "Прізвище"
 
-#: ../addressbook/libebook/e-contact.c:126
+#: ../addressbook/libebook/e-contact.c:125
 msgid "Nickname"
 msgstr "Прізвисько"
 
 #. Email fields
-#: ../addressbook/libebook/e-contact.c:129
+#: ../addressbook/libebook/e-contact.c:128
 msgid "Email 1"
 msgstr "Ел.пошта 1"
 
-#: ../addressbook/libebook/e-contact.c:130
+#: ../addressbook/libebook/e-contact.c:129
 msgid "Email 2"
 msgstr "Ел.пошта 2"
 
-#: ../addressbook/libebook/e-contact.c:131
+#: ../addressbook/libebook/e-contact.c:130
 msgid "Email 3"
 msgstr "Ел.пошта 3"
 
-#: ../addressbook/libebook/e-contact.c:132
+#: ../addressbook/libebook/e-contact.c:131
 msgid "Email 4"
 msgstr "Ел.пошта 4"
 
-#: ../addressbook/libebook/e-contact.c:134
+#: ../addressbook/libebook/e-contact.c:133
 msgid "Mailer"
 msgstr "Поштова програма"
 
 #. Address Labels
-#: ../addressbook/libebook/e-contact.c:137
+#: ../addressbook/libebook/e-contact.c:136
 msgid "Home Address Label"
 msgstr "Ярлик домашньої адреси"
 
-#: ../addressbook/libebook/e-contact.c:138
+#: ../addressbook/libebook/e-contact.c:137
 msgid "Work Address Label"
 msgstr "Ярлик робочої адреси"
 
-#: ../addressbook/libebook/e-contact.c:139
+#: ../addressbook/libebook/e-contact.c:138
 msgid "Other Address Label"
 msgstr "Ярлик іншої адреси"
 
 #. Phone fields
-#: ../addressbook/libebook/e-contact.c:142
+#: ../addressbook/libebook/e-contact.c:141
 msgid "Assistant Phone"
 msgstr "Телефон помічника"
 
-#: ../addressbook/libebook/e-contact.c:143
+#: ../addressbook/libebook/e-contact.c:142
 msgid "Business Phone"
 msgstr "Робочий телефон"
 
-#: ../addressbook/libebook/e-contact.c:144
+#: ../addressbook/libebook/e-contact.c:143
 msgid "Business Phone 2"
 msgstr "Робочий телефон 2"
 
-#: ../addressbook/libebook/e-contact.c:145
+#: ../addressbook/libebook/e-contact.c:144
 msgid "Business Fax"
 msgstr "Робочий факс"
 
-#: ../addressbook/libebook/e-contact.c:146
+#: ../addressbook/libebook/e-contact.c:145
 msgid "Callback Phone"
 msgstr "Телефон для зворотного дзвінка"
 
-#: ../addressbook/libebook/e-contact.c:147
+#: ../addressbook/libebook/e-contact.c:146
 msgid "Car Phone"
 msgstr "Автомобільний телефон"
 
-#: ../addressbook/libebook/e-contact.c:148
+#: ../addressbook/libebook/e-contact.c:147
 msgid "Company Phone"
 msgstr "Телефон компанії"
 
-#: ../addressbook/libebook/e-contact.c:149
+#: ../addressbook/libebook/e-contact.c:148
 msgid "Home Phone"
 msgstr "Домашній телефон"
 
-#: ../addressbook/libebook/e-contact.c:150
+#: ../addressbook/libebook/e-contact.c:149
 msgid "Home Phone 2"
 msgstr "Домашній телефон 2"
 
-#: ../addressbook/libebook/e-contact.c:151
+#: ../addressbook/libebook/e-contact.c:150
 msgid "Home Fax"
 msgstr "Домашній факс"
 
-#: ../addressbook/libebook/e-contact.c:152
+#: ../addressbook/libebook/e-contact.c:151
 msgid "ISDN"
 msgstr "ISDN"
 
-#: ../addressbook/libebook/e-contact.c:153
+#: ../addressbook/libebook/e-contact.c:152
 msgid "Mobile Phone"
 msgstr "Мобільний телефон"
 
-#: ../addressbook/libebook/e-contact.c:154
+#: ../addressbook/libebook/e-contact.c:153
 msgid "Other Phone"
 msgstr "Інший телефон"
 
-#: ../addressbook/libebook/e-contact.c:155
+#: ../addressbook/libebook/e-contact.c:154
 msgid "Other Fax"
 msgstr "Інший факс"
 
-#: ../addressbook/libebook/e-contact.c:156
+#: ../addressbook/libebook/e-contact.c:155
 msgid "Pager"
 msgstr "Пейджер"
 
-#: ../addressbook/libebook/e-contact.c:157
+#: ../addressbook/libebook/e-contact.c:156
 msgid "Primary Phone"
 msgstr "Основний телефон"
 
-#: ../addressbook/libebook/e-contact.c:158
+#: ../addressbook/libebook/e-contact.c:157
 msgid "Radio"
 msgstr "Радіо"
 
-#: ../addressbook/libebook/e-contact.c:159
+#: ../addressbook/libebook/e-contact.c:158
 msgid "Telex"
 msgstr "Телекс"
 
 #. To translators: TTY is Teletypewriter
-#: ../addressbook/libebook/e-contact.c:161
+#: ../addressbook/libebook/e-contact.c:160
 msgid "TTY"
 msgstr "TTY"
 
 #. Organizational fields
-#: ../addressbook/libebook/e-contact.c:164
+#: ../addressbook/libebook/e-contact.c:163
 msgid "Organization"
 msgstr "Організація"
 
-#: ../addressbook/libebook/e-contact.c:165
+#: ../addressbook/libebook/e-contact.c:164
 msgid "Organizational Unit"
 msgstr "Відділ організації"
 
-#: ../addressbook/libebook/e-contact.c:166
+#: ../addressbook/libebook/e-contact.c:165
 msgid "Office"
 msgstr "Офіс"
 
-#: ../addressbook/libebook/e-contact.c:167
+#: ../addressbook/libebook/e-contact.c:166
 msgid "Title"
 msgstr "Титул"
 
-#: ../addressbook/libebook/e-contact.c:168
+#: ../addressbook/libebook/e-contact.c:167
 msgid "Role"
 msgstr "Роль"
 
-#: ../addressbook/libebook/e-contact.c:169
+#: ../addressbook/libebook/e-contact.c:168
 msgid "Manager"
 msgstr "Керівник"
 
-#: ../addressbook/libebook/e-contact.c:170
+#: ../addressbook/libebook/e-contact.c:169
 msgid "Assistant"
 msgstr "Помічник"
 
 #. Web fields
-#: ../addressbook/libebook/e-contact.c:173
+#: ../addressbook/libebook/e-contact.c:172
 msgid "Homepage URL"
 msgstr "URL домашньої сторінки"
 
-#: ../addressbook/libebook/e-contact.c:174
+#: ../addressbook/libebook/e-contact.c:173
 msgid "Weblog URL"
 msgstr "URL веблогу"
 
 #. Contact categories
-#: ../addressbook/libebook/e-contact.c:177
-#: ../libedataserverui/e-categories-dialog.c:439
+#: ../addressbook/libebook/e-contact.c:176
+#: ../libedataserverui/e-categories-dialog.c:426
 msgid "Categories"
 msgstr "Категорії"
 
 #. Collaboration fields
-#: ../addressbook/libebook/e-contact.c:180
+#: ../addressbook/libebook/e-contact.c:179
 msgid "Calendar URI"
 msgstr "URI календаря"
 
-#: ../addressbook/libebook/e-contact.c:181
+#: ../addressbook/libebook/e-contact.c:180
 msgid "Free/Busy URL"
 msgstr "Посилання (URL) \"вільний/зайнятий\""
 
-#: ../addressbook/libebook/e-contact.c:182
+#: ../addressbook/libebook/e-contact.c:181
 msgid "ICS Calendar"
 msgstr "Календар формату ICS"
 
-#: ../addressbook/libebook/e-contact.c:183
+#: ../addressbook/libebook/e-contact.c:182
 msgid "Video Conferencing URL"
 msgstr "URL відеоконференцій"
 
 #. Misc fields
-#: ../addressbook/libebook/e-contact.c:186
+#: ../addressbook/libebook/e-contact.c:185
 msgid "Spouse's Name"
 msgstr "Ім'я чоловіка/дружини"
 
-#: ../addressbook/libebook/e-contact.c:187
+#: ../addressbook/libebook/e-contact.c:186
 msgid "Note"
 msgstr "Примітка"
 
 #. Instant messaging fields
-#: ../addressbook/libebook/e-contact.c:190
+#: ../addressbook/libebook/e-contact.c:189
 msgid "AIM Home Screen Name 1"
 msgstr "Домашня екранна назва AIM 1"
 
-#: ../addressbook/libebook/e-contact.c:191
+#: ../addressbook/libebook/e-contact.c:190
 msgid "AIM Home Screen Name 2"
 msgstr "Домашня екранна назва AIM 2"
 
-#: ../addressbook/libebook/e-contact.c:192
+#: ../addressbook/libebook/e-contact.c:191
 msgid "AIM Home Screen Name 3"
 msgstr "Домашня екранна назва AIM 3"
 
-#: ../addressbook/libebook/e-contact.c:193
+#: ../addressbook/libebook/e-contact.c:192
 msgid "AIM Work Screen Name 1"
 msgstr "Робоча екранна назва AIM 1"
 
-#: ../addressbook/libebook/e-contact.c:194
+#: ../addressbook/libebook/e-contact.c:193
 msgid "AIM Work Screen Name 2"
 msgstr "Робоча екранна назва AIM 2"
 
-#: ../addressbook/libebook/e-contact.c:195
+#: ../addressbook/libebook/e-contact.c:194
 msgid "AIM Work Screen Name 3"
 msgstr "Робоча екранна назва AIM 3"
 
-#: ../addressbook/libebook/e-contact.c:196
+#: ../addressbook/libebook/e-contact.c:195
 msgid "GroupWise Home Screen Name 1"
 msgstr "GroupWise домашня екранна назва 1"
 
-#: ../addressbook/libebook/e-contact.c:197
+#: ../addressbook/libebook/e-contact.c:196
 msgid "GroupWise Home Screen Name 2"
 msgstr "GroupWise домашня екранна назва 2"
 
-#: ../addressbook/libebook/e-contact.c:198
+#: ../addressbook/libebook/e-contact.c:197
 msgid "GroupWise Home Screen Name 3"
 msgstr "GroupWise домашня екранна назва 3"
 
-#: ../addressbook/libebook/e-contact.c:199
+#: ../addressbook/libebook/e-contact.c:198
 msgid "GroupWise Work Screen Name 1"
 msgstr "GroupWise робоча екранна назва 1"
 
-#: ../addressbook/libebook/e-contact.c:200
+#: ../addressbook/libebook/e-contact.c:199
 msgid "GroupWise Work Screen Name 2"
 msgstr "GroupWise робоча екранна назва 2"
 
-#: ../addressbook/libebook/e-contact.c:201
+#: ../addressbook/libebook/e-contact.c:200
 msgid "GroupWise Work Screen Name 3"
 msgstr "GroupWise робоча екранна назва 3"
 
-#: ../addressbook/libebook/e-contact.c:202
+#: ../addressbook/libebook/e-contact.c:201
 msgid "Jabber Home Id 1"
 msgstr "Домашній ідентифікатор Jabber 1"
 
-#: ../addressbook/libebook/e-contact.c:203
+#: ../addressbook/libebook/e-contact.c:202
 msgid "Jabber Home Id 2"
 msgstr "Домашній ідентифікатор Jabber 2"
 
-#: ../addressbook/libebook/e-contact.c:204
+#: ../addressbook/libebook/e-contact.c:203
 msgid "Jabber Home Id 3"
 msgstr "Домашній ідентифікатор Jabber 3"
 
-#: ../addressbook/libebook/e-contact.c:205
+#: ../addressbook/libebook/e-contact.c:204
 msgid "Jabber Work Id 1"
 msgstr "Робочий ідентифікатор Jabber 1"
 
-#: ../addressbook/libebook/e-contact.c:206
+#: ../addressbook/libebook/e-contact.c:205
 msgid "Jabber Work Id 2"
 msgstr "Робочий ідентифікатор Jabber 1"
 
-#: ../addressbook/libebook/e-contact.c:207
+#: ../addressbook/libebook/e-contact.c:206
 msgid "Jabber Work Id 3"
 msgstr "Робочий ідентифікатор Jabber 1"
 
-#: ../addressbook/libebook/e-contact.c:208
+#: ../addressbook/libebook/e-contact.c:207
 msgid "Yahoo! Home Screen Name 1"
 msgstr "Yahoo! Домашня екранна назва 1"
 
-#: ../addressbook/libebook/e-contact.c:209
+#: ../addressbook/libebook/e-contact.c:208
 msgid "Yahoo! Home Screen Name 2"
 msgstr "Yahoo! Домашня екранна назва 2"
 
-#: ../addressbook/libebook/e-contact.c:210
+#: ../addressbook/libebook/e-contact.c:209
 msgid "Yahoo! Home Screen Name 3"
 msgstr "Yahoo! Домашня екранна назва 3"
 
-#: ../addressbook/libebook/e-contact.c:211
+#: ../addressbook/libebook/e-contact.c:210
 msgid "Yahoo! Work Screen Name 1"
 msgstr "Yahoo! Робоча екранна назва 1"
 
-#: ../addressbook/libebook/e-contact.c:212
+#: ../addressbook/libebook/e-contact.c:211
 msgid "Yahoo! Work Screen Name 2"
 msgstr "Yahoo! Робоча екранна назва 2"
 
-#: ../addressbook/libebook/e-contact.c:213
+#: ../addressbook/libebook/e-contact.c:212
 msgid "Yahoo! Work Screen Name 3"
 msgstr "Yahoo! Робоча екранна назва 3"
 
-#: ../addressbook/libebook/e-contact.c:214
+#: ../addressbook/libebook/e-contact.c:213
 msgid "MSN Home Screen Name 1"
 msgstr "Домашня екранна назва MSN 1"
 
-#: ../addressbook/libebook/e-contact.c:215
+#: ../addressbook/libebook/e-contact.c:214
 msgid "MSN Home Screen Name 2"
 msgstr "Домашня екранна назва MSN 2"
 
-#: ../addressbook/libebook/e-contact.c:216
+#: ../addressbook/libebook/e-contact.c:215
 msgid "MSN Home Screen Name 3"
 msgstr "Домашня екранна назва MSN 3"
 
-#: ../addressbook/libebook/e-contact.c:217
+#: ../addressbook/libebook/e-contact.c:216
 msgid "MSN Work Screen Name 1"
 msgstr "Робоча екранна назва MSN 1"
 
-#: ../addressbook/libebook/e-contact.c:218
+#: ../addressbook/libebook/e-contact.c:217
 msgid "MSN Work Screen Name 2"
 msgstr "Робоча екранна назва MSN 2"
 
-#: ../addressbook/libebook/e-contact.c:219
+#: ../addressbook/libebook/e-contact.c:218
 msgid "MSN Work Screen Name 3"
 msgstr "Робоча екранна назва MSN 3"
 
-#: ../addressbook/libebook/e-contact.c:220
+#: ../addressbook/libebook/e-contact.c:219
 msgid "ICQ Home Id 1"
 msgstr "Ідентифікатор домашнього ICQ 1"
 
-#: ../addressbook/libebook/e-contact.c:221
+#: ../addressbook/libebook/e-contact.c:220
 msgid "ICQ Home Id 2"
 msgstr "Ідентифікатор домашнього ICQ 2"
 
-#: ../addressbook/libebook/e-contact.c:222
+#: ../addressbook/libebook/e-contact.c:221
 msgid "ICQ Home Id 3"
 msgstr "Ідентифікатор домашнього ICQ 3"
 
-#: ../addressbook/libebook/e-contact.c:223
+#: ../addressbook/libebook/e-contact.c:222
 msgid "ICQ Work Id 1"
 msgstr "Ідентифікатор робочого ICQ 1"
 
-#: ../addressbook/libebook/e-contact.c:224
+#: ../addressbook/libebook/e-contact.c:223
 msgid "ICQ Work Id 2"
 msgstr "Ідентифікатор робочого ICQ 2"
 
-#: ../addressbook/libebook/e-contact.c:225
+#: ../addressbook/libebook/e-contact.c:224
 msgid "ICQ Work Id 3"
 msgstr "Ідентифікатор робочого ICQ 3"
 
 #. Last modified time
-#: ../addressbook/libebook/e-contact.c:228
+#: ../addressbook/libebook/e-contact.c:227
 msgid "Last Revision"
 msgstr "Остання версія"
 
-#: ../addressbook/libebook/e-contact.c:229
+#: ../addressbook/libebook/e-contact.c:228
 msgid "Name or Org"
 msgstr "Назва або організація"
 
 #. Address fields
-#: ../addressbook/libebook/e-contact.c:232
+#: ../addressbook/libebook/e-contact.c:231
 msgid "Address List"
 msgstr "Список Адреса"
 
-#: ../addressbook/libebook/e-contact.c:233
+#: ../addressbook/libebook/e-contact.c:232
 msgid "Home Address"
 msgstr "Домашня адреса"
 
-#: ../addressbook/libebook/e-contact.c:234
+#: ../addressbook/libebook/e-contact.c:233
 msgid "Work Address"
 msgstr "Робоча адреса"
 
-#: ../addressbook/libebook/e-contact.c:235
+#: ../addressbook/libebook/e-contact.c:234
 msgid "Other Address"
 msgstr "Інша адреса"
 
 #. Contact categories
-#: ../addressbook/libebook/e-contact.c:238
+#: ../addressbook/libebook/e-contact.c:237
 msgid "Category List"
 msgstr "Список категорій"
 
 #. Photo/Logo
-#: ../addressbook/libebook/e-contact.c:241
+#: ../addressbook/libebook/e-contact.c:240
 msgid "Photo"
 msgstr "Фотографія"
 
-#: ../addressbook/libebook/e-contact.c:242
+#: ../addressbook/libebook/e-contact.c:241
 msgid "Logo"
 msgstr "Емблема"
 
-#: ../addressbook/libebook/e-contact.c:244
+#: ../addressbook/libebook/e-contact.c:243
 msgid "Name"
 msgstr "Ім'я"
 
-#: ../addressbook/libebook/e-contact.c:245
+#: ../addressbook/libebook/e-contact.c:244
 msgid "Email List"
 msgstr "Список адрес ел.пошти"
 
 #. Instant messaging fields
-#: ../addressbook/libebook/e-contact.c:248
+#: ../addressbook/libebook/e-contact.c:247
 msgid "AIM Screen Name List"
 msgstr "Список екранних назв AIM"
 
-#: ../addressbook/libebook/e-contact.c:249
+#: ../addressbook/libebook/e-contact.c:248
 msgid "GroupWise Id List"
 msgstr "Список ідентифікаторів GroupWise"
 
-#: ../addressbook/libebook/e-contact.c:250
+#: ../addressbook/libebook/e-contact.c:249
 msgid "Jabber Id List"
 msgstr "Список ідентифікаторів Jabber"
 
-#: ../addressbook/libebook/e-contact.c:251
+#: ../addressbook/libebook/e-contact.c:250
 msgid "Yahoo! Screen Name List"
 msgstr "Список екранних назв Yahoo!"
 
-#: ../addressbook/libebook/e-contact.c:252
+#: ../addressbook/libebook/e-contact.c:251
 msgid "MSN Screen Name List"
 msgstr "Список екранних назв MSN"
 
-#: ../addressbook/libebook/e-contact.c:253
+#: ../addressbook/libebook/e-contact.c:252
 msgid "ICQ Id List"
 msgstr "Список ідентифікаторів ICQ"
 
-#: ../addressbook/libebook/e-contact.c:255
+#: ../addressbook/libebook/e-contact.c:254
 msgid "Wants HTML Mail"
 msgstr "Сприймає пошту у HTML"
 
-#: ../addressbook/libebook/e-contact.c:257
+#: ../addressbook/libebook/e-contact.c:256
 msgid "List"
 msgstr "Список"
 
-#: ../addressbook/libebook/e-contact.c:258
+#: ../addressbook/libebook/e-contact.c:257
 msgid "List Show Addresses"
 msgstr "Адреса показу списку"
 
-#: ../addressbook/libebook/e-contact.c:260
+#: ../addressbook/libebook/e-contact.c:259
 msgid "Birth Date"
 msgstr "Дата народження"
 
-#: ../addressbook/libebook/e-contact.c:261
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:462
+#: ../addressbook/libebook/e-contact.c:260
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:461
 #: ../libedataserver/e-categories.c:43
 msgid "Anniversary"
 msgstr "Річниця"
 
 #. Security fields
-#: ../addressbook/libebook/e-contact.c:264
+#: ../addressbook/libebook/e-contact.c:263
 msgid "X.509 Certificate"
 msgstr "X.509 сертифікат"
 
-#: ../addressbook/libebook/e-contact.c:266
+#: ../addressbook/libebook/e-contact.c:265
 msgid "Gadu-Gadu Home Id 1"
 msgstr "Домашній ідентифікатор Gadu-Gadu 1"
 
-#: ../addressbook/libebook/e-contact.c:267
+#: ../addressbook/libebook/e-contact.c:266
 msgid "Gadu-Gadu Home Id 2"
 msgstr "Домашній ідентифікатор Gadu-Gadu 2"
 
-#: ../addressbook/libebook/e-contact.c:268
+#: ../addressbook/libebook/e-contact.c:267
 msgid "Gadu-Gadu Home Id 3"
 msgstr "Домашній ідентифікатор Gadu-Gadu 3"
 
-#: ../addressbook/libebook/e-contact.c:269
+#: ../addressbook/libebook/e-contact.c:268
 msgid "Gadu-Gadu Work Id 1"
 msgstr "Робочий ідентифікатор Gadu-Gadu 1"
 
-#: ../addressbook/libebook/e-contact.c:270
+#: ../addressbook/libebook/e-contact.c:269
 msgid "Gadu-Gadu Work Id 2"
 msgstr "Робочий ідентифікатор Gadu-Gadu 2"
 
-#: ../addressbook/libebook/e-contact.c:271
+#: ../addressbook/libebook/e-contact.c:270
 msgid "Gadu-Gadu Work Id 3"
 msgstr "Робочий ідентифікатор Gadu-Gadu 3"
 
-#: ../addressbook/libebook/e-contact.c:272
+#: ../addressbook/libebook/e-contact.c:271
 msgid "Gadu-Gadu Id List"
 msgstr "Список ідентифікаторів Gadu-Gadu"
 
 #. Geo information
-#: ../addressbook/libebook/e-contact.c:275
+#: ../addressbook/libebook/e-contact.c:274
 msgid "Geographic Information"
 msgstr "Географічна інформація"
 
-#: ../addressbook/libebook/e-contact.c:277
+#: ../addressbook/libebook/e-contact.c:276
 msgid "Telephone"
 msgstr "Телефон"
 
-#: ../addressbook/libebook/e-contact.c:1494
+#: ../addressbook/libebook/e-contact.c:1499
 #: ../addressbook/libebook/e-destination.c:761
 msgid "Unnamed List"
 msgstr "Неназваний список"
 
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:464
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:463
 #: ../libedataserver/e-categories.c:44
 msgid "Birthday"
 msgstr "День народження"
 
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:490
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:489
 #, c-format
 msgid "Birthday: %s"
 msgstr "День народження: %s"
 
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:514
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:513
 #, c-format
 msgid "Anniversary: %s"
 msgstr "Річниця: %s"
 
-#: ../calendar/backends/file/e-cal-backend-file.c:203
+#: ../calendar/backends/file/e-cal-backend-file.c:212
 msgid "Cannot save calendar data: Malformed URI."
 msgstr "Не вдається зберегти дані календаря: неправильний URI."
 
-#: ../calendar/backends/google/e-cal-backend-google-utils.c:337
+#: ../calendar/backends/file/e-cal-backend-file.c:219
+#: ../calendar/backends/file/e-cal-backend-file.c:225
+msgid "Cannot save calendar data"
+msgstr "Не вдається зберегти дані календаря"
+
+#: ../calendar/backends/google/e-cal-backend-google-utils.c:335
 msgid "Could not create thread for getting deltas"
 msgstr "Не вдається створити потік для отримання різниці"
 
-#: ../calendar/backends/google/e-cal-backend-google-utils.c:369
-#: ../calendar/backends/google/e-cal-backend-google.c:1179
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1039
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1338
-#: ../calendar/backends/http/e-cal-backend-http.c:569
+#: ../calendar/backends/google/e-cal-backend-google-utils.c:367
+#: ../calendar/backends/google/e-cal-backend-google.c:1191
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1053
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1352
+#: ../calendar/backends/http/e-cal-backend-http.c:582
 #: ../calendar/backends/weather/e-cal-backend-weather.c:466
 msgid "Could not create cache file"
 msgstr "Не вдається створити файл кешу"
 
-#: ../calendar/backends/google/e-cal-backend-google-utils.c:382
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1051
+#: ../calendar/backends/google/e-cal-backend-google-utils.c:380
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1065
 msgid "Could not create thread for populating cache"
 msgstr "Не вдається створити потік для заповнення кешу"
 
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:1028
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1784
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:1056
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1844
 msgid "Reply Requested: by "
 msgstr "Запитано відповідь:"
 
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:1033
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1789
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:1061
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1849
 msgid "Reply Requested: When convenient"
 msgstr "Запитано відповідь: Коли зручно"
 
@@ -726,38 +731,39 @@
 msgid "Loading %s items"
 msgstr "Завантаження %s елементів"
 
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:875
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:889
 #: ../servers/exchange/storage/exchange-hierarchy-foreign.c:260
 msgid "Calendar"
 msgstr "Календар"
 
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:933
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:947
 msgid "Invalid server URI"
 msgstr "Неправильний URI сервера"
 
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:952
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:961
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1057
-#: ../calendar/libecal/e-cal.c:5031
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1069
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1101
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1139
-#: ../camel/providers/groupwise/camel-groupwise-store.c:594
-#: ../camel/providers/groupwise/camel-groupwise-store.c:746
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:966
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:975
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1071
+#: ../calendar/libecal/e-cal.c:5082
+#: ../calendar/libedata-cal/e-cal-backend-util.c:109
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1098
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1130
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1168
+#: ../camel/providers/groupwise/camel-groupwise-store.c:580
+#: ../camel/providers/groupwise/camel-groupwise-store.c:745
 #: ../camel/providers/groupwise/camel-groupwise-transport.c:157
 #: ../camel/providers/groupwise/camel-groupwise-transport.c:184
 msgid "Authentication failed"
 msgstr "Збій перевірки автентичності"
 
-#: ../calendar/backends/http/e-cal-backend-http.c:269
+#: ../calendar/backends/http/e-cal-backend-http.c:267
 msgid "Redirected to Invalid URI"
 msgstr "Переадресований на неправильний URI"
 
-#: ../calendar/backends/http/e-cal-backend-http.c:290
+#: ../calendar/backends/http/e-cal-backend-http.c:288
 msgid "Bad file format."
 msgstr "Неправильний формат файлу."
 
-#: ../calendar/backends/http/e-cal-backend-http.c:296
+#: ../calendar/backends/http/e-cal-backend-http.c:294
 msgid "Not a calendar."
 msgstr "Не є календарем."
 
@@ -954,7 +960,7 @@
 msgid "%.1f-%.1fin snow\n"
 msgstr "%.1f-%.1fдюймів снігу\n"
 
-#: ../calendar/libecal/e-cal-component.c:1315
+#: ../calendar/libecal/e-cal-component.c:1322
 msgid "Untitled appointment"
 msgstr "Неназвана зустріч"
 
@@ -1082,24 +1088,24 @@
 msgid "31st"
 msgstr "31-е"
 
-#: ../calendar/libecal/e-cal-util.c:684 ../calendar/libecal/e-cal-util.c:712
+#: ../calendar/libecal/e-cal-util.c:685 ../calendar/libecal/e-cal-util.c:713
 msgid "High"
 msgstr "Високий"
 
-#: ../calendar/libecal/e-cal-util.c:686 ../calendar/libecal/e-cal-util.c:714
+#: ../calendar/libecal/e-cal-util.c:687 ../calendar/libecal/e-cal-util.c:715
 msgid "Normal"
 msgstr "Звичайний"
 
-#: ../calendar/libecal/e-cal-util.c:688 ../calendar/libecal/e-cal-util.c:716
+#: ../calendar/libecal/e-cal-util.c:689 ../calendar/libecal/e-cal-util.c:717
 msgid "Low"
 msgstr "Низький"
 
 #. An empty string is the same as 'None'.
-#: ../calendar/libecal/e-cal-util.c:710
+#: ../calendar/libecal/e-cal-util.c:711
 msgid "Undefined"
 msgstr "Невизначено"
 
-#: ../calendar/libecal/e-cal.c:1665 ../libedataserverui/e-book-auth-util.c:200
+#: ../calendar/libecal/e-cal.c:1665 ../libedataserverui/e-book-auth-util.c:199
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "Введіть пароль для %s (користувач %s)"
@@ -1113,87 +1119,106 @@
 msgid "Enter password for %s to enable proxy for user %s"
 msgstr "Введіть пароль для %s щоб увімкнути проксі для користувача %s"
 
-#: ../calendar/libecal/e-cal.c:5003
+#: ../calendar/libecal/e-cal.c:5054
 msgid "Invalid argument"
 msgstr "Неправильний аргумент"
 
-#: ../calendar/libecal/e-cal.c:5005
+#: ../calendar/libecal/e-cal.c:5056
 msgid "Backend is busy"
 msgstr "База даних зайнята"
 
-#: ../calendar/libecal/e-cal.c:5007
+#: ../calendar/libecal/e-cal.c:5058
+#: ../calendar/libedata-cal/e-cal-backend-util.c:97
 msgid "Repository is offline"
 msgstr "Репозиторій відключений від мережі"
 
-#: ../calendar/libecal/e-cal.c:5009
+#: ../calendar/libecal/e-cal.c:5060
+#: ../calendar/libedata-cal/e-cal-backend-util.c:121
 msgid "No such calendar"
 msgstr "Немає такого календаря"
 
-#: ../calendar/libecal/e-cal.c:5011 ../servers/groupwise/e-gw-connection.c:199
+#: ../calendar/libecal/e-cal.c:5062
+#: ../calendar/libedata-cal/e-cal-backend-util.c:103
+#: ../servers/groupwise/e-gw-connection.c:233
 msgid "Object not found"
 msgstr "Об'єкт не існує"
 
-#: ../calendar/libecal/e-cal.c:5013 ../servers/groupwise/e-gw-connection.c:193
+#: ../calendar/libecal/e-cal.c:5064
+#: ../calendar/libedata-cal/e-cal-backend-util.c:105
+#: ../servers/groupwise/e-gw-connection.c:227
 msgid "Invalid object"
 msgstr "Неправильний об'єкт"
 
-#: ../calendar/libecal/e-cal.c:5015
+#: ../calendar/libecal/e-cal.c:5066
 msgid "URI not loaded"
 msgstr "URI не завантажений"
 
-#: ../calendar/libecal/e-cal.c:5017
+#: ../calendar/libecal/e-cal.c:5068
 msgid "URI already loaded"
 msgstr "URI вже завантажений"
 
-#: ../calendar/libecal/e-cal.c:5019
+#: ../calendar/libecal/e-cal.c:5070
+#: ../calendar/libedata-cal/e-cal-backend-util.c:99
 #: ../servers/exchange/storage/e-storage.c:571
 msgid "Permission denied"
 msgstr "Доступ заборонено"
 
-#: ../calendar/libecal/e-cal.c:5021 ../servers/groupwise/e-gw-connection.c:201
+#: ../calendar/libecal/e-cal.c:5072
+#: ../calendar/libedata-cal/e-cal-backend-util.c:123
+#: ../servers/groupwise/e-gw-connection.c:235
 msgid "Unknown User"
 msgstr "Невідомий користувач"
 
-#: ../calendar/libecal/e-cal.c:5023
+#: ../calendar/libecal/e-cal.c:5074
+#: ../calendar/libedata-cal/e-cal-backend-util.c:107
 msgid "Object ID already exists"
 msgstr "Ідентифікатор об'єкту вже існує"
 
-#: ../calendar/libecal/e-cal.c:5025
+#: ../calendar/libecal/e-cal.c:5076
 msgid "Protocol not supported"
 msgstr "Протокол не підтримується"
 
-#: ../calendar/libecal/e-cal.c:5027
+#: ../calendar/libecal/e-cal.c:5078
 msgid "Operation has been canceled"
 msgstr "Операцію було скасовано"
 
-#: ../calendar/libecal/e-cal.c:5029
+#: ../calendar/libecal/e-cal.c:5080
+#: ../calendar/libedata-cal/e-cal-backend-util.c:136
 msgid "Could not cancel operation"
 msgstr "Не вдається скасувати операцію"
 
-#: ../calendar/libecal/e-cal.c:5033
-#: ../camel/providers/smtp/camel-smtp-transport.c:216
+#: ../calendar/libecal/e-cal.c:5084
+#: ../calendar/libedata-cal/e-cal-backend-util.c:111
+#: ../camel/providers/smtp/camel-smtp-transport.c:218
 msgid "Authentication required"
 msgstr "Вимагається автентифікація"
 
-#: ../calendar/libecal/e-cal.c:5035
+#: ../calendar/libecal/e-cal.c:5086
 msgid "A CORBA exception has occurred"
 msgstr "Виникла виключна ситуація системи CORBA"
 
-#: ../calendar/libecal/e-cal.c:5037
+#: ../calendar/libecal/e-cal.c:5088
+#: ../calendar/libedata-cal/e-cal-backend-util.c:139
 #: ../camel/providers/groupwise/camel-groupwise-transport.c:223
-#: ../camel/providers/imap/camel-imap-command.c:312
-#: ../camel/providers/imap/camel-imap-command.c:412
-#: ../camel/providers/imap/camel-imap-store.c:762
-#: ../camel/providers/imap4/camel-imap4-store.c:313
-#: ../camel/providers/pop3/camel-pop3-store.c:559
+#: ../camel/providers/imap/camel-imap-command.c:434
+#: ../camel/providers/imap/camel-imap-store.c:743
+#: ../camel/providers/imap4/camel-imap4-engine.c:1570
+#: ../camel/providers/imap4/camel-imap4-engine.c:1609
+#: ../camel/providers/imap4/camel-imap4-engine.c:1654
+#: ../camel/providers/imap4/camel-imap4-engine.c:1710
+#: ../camel/providers/imap4/camel-imap4-store.c:315
+#: ../camel/providers/imap4/camel-imap4-store.c:823
+#: ../camel/providers/imap4/camel-imap4-store.c:1579
+#: ../camel/providers/pop3/camel-pop3-store.c:553
+#: ../camel/providers/pop3/camel-pop3-store.c:560
 #: ../camel/providers/pop3/camel-pop3-store.c:566
-#: ../camel/providers/pop3/camel-pop3-store.c:572
 #: ../servers/exchange/storage/e-storage.c:585
-#: ../servers/groupwise/e-gw-connection.c:207
+#: ../servers/groupwise/e-gw-connection.c:241
 msgid "Unknown error"
 msgstr "Невідома помилка"
 
-#: ../calendar/libecal/e-cal.c:5039
+#: ../calendar/libecal/e-cal.c:5090
+#: ../calendar/libedata-cal/e-cal-backend-util.c:95
 #: ../servers/exchange/storage/e-storage.c:553
 msgid "No error"
 msgstr "Без помилок"
@@ -1293,6 +1318,51 @@
 "\"%s\" очікує, що усі аргументи будуть символьного типу, або єдиний аргумент "
 "логічного типу - хибність (#f)"
 
+#: ../calendar/libedata-cal/e-cal-backend-util.c:101
+msgid "Invalid range"
+msgstr "Неправильний діапазон"
+
+#: ../calendar/libedata-cal/e-cal-backend-util.c:113
+msgid "Unsupported field"
+msgstr "Непідтримуване полу"
+
+#: ../calendar/libedata-cal/e-cal-backend-util.c:115
+msgid "Unsupported method"
+msgstr "Непідтримуваний метод"
+
+#: ../calendar/libedata-cal/e-cal-backend-util.c:117
+msgid "Unsupported authentication method"
+msgstr "Непідтримуваний метод автентифікації"
+
+#: ../calendar/libedata-cal/e-cal-backend-util.c:119
+msgid "TLS not available"
+msgstr "TLS недоступний"
+
+#. Translators: This means "Offline mode unavailable"
+#: ../calendar/libedata-cal/e-cal-backend-util.c:126
+msgid "Offline unavailable"
+msgstr "Автономний режим недоступний"
+
+#: ../calendar/libedata-cal/e-cal-backend-util.c:128
+msgid "Search size limit exceeded"
+msgstr "Перевищено обмеження на розмір результатів пошуку"
+
+#: ../calendar/libedata-cal/e-cal-backend-util.c:130
+msgid "Search time limit exceeded"
+msgstr "Перевищено обмеження на час пошуку"
+
+#: ../calendar/libedata-cal/e-cal-backend-util.c:132
+msgid "Invalid query"
+msgstr "Некоректний запит"
+
+#: ../calendar/libedata-cal/e-cal-backend-util.c:134
+msgid "Query refused"
+msgstr "Запит відхилено"
+
+#: ../calendar/libedata-cal/e-cal-backend-util.c:141
+msgid "Invalid server version"
+msgstr "Неправильна версія сервера"
+
 #: ../camel/camel-cipher-context.c:102
 msgid "Signing is not supported by this cipher"
 msgstr "Підписування не підтримується цим шифром"
@@ -1333,15 +1403,19 @@
 msgid "You may not export keys with this cipher"
 msgstr "Ви не можете експортувати ключі цим шифром"
 
-#: ../camel/camel-data-cache.c:137
+#: ../camel/camel-data-cache.c:136
 msgid "Unable to create cache path"
 msgstr "Не вдається створити шлях до кеша"
 
-#: ../camel/camel-data-cache.c:384
+#: ../camel/camel-data-cache.c:381
 #, c-format
 msgid "Could not remove cache entry: %s: %s"
 msgstr "Не вдається видалити кешований елемент: %s: %s"
 
+#: ../camel/camel-db.c:99
+msgid "Insufficient memory"
+msgstr "Недостатньо пам'яті"
+
 #: ../camel/camel-disco-diary.c:198
 #, c-format
 msgid ""
@@ -1354,9 +1428,10 @@
 "з'єднаєтесь з сервером повторно."
 
 #: ../camel/camel-disco-diary.c:261
+#: ../camel/providers/imap/camel-imap-journal.c:299
 #, c-format
 msgid ""
-"Could not open `%s':\n"
+"Could not open '%s':\n"
 "%s\n"
 "Changes made to this folder will not be resynchronized."
 msgstr ""
@@ -1376,97 +1451,101 @@
 msgid "Downloading new messages for offline mode"
 msgstr "Завантажуються нові повідомлення для автономної роботи"
 
-#: ../camel/camel-disco-folder.c:468
+#: ../camel/camel-disco-folder.c:469
 #, c-format
 msgid "Preparing folder '%s' for offline"
 msgstr "Підготовка теки '%s' для автономної роботи"
 
 #: ../camel/camel-disco-store.c:403
-#: ../camel/providers/imap/camel-imap-store.c:3018
+#: ../camel/providers/groupwise/camel-groupwise-store.c:226
+#: ../camel/providers/imap/camel-imap-store.c:1003
+#: ../camel/providers/imap/camel-imap-store.c:1813
+#: ../camel/providers/imap/camel-imap-store.c:2229
+#: ../camel/providers/imap/camel-imap-store.c:2997
 msgid "You must be working online to complete this operation"
 msgstr "Для завершення цієї операції необхідне підключення до мережі"
 
-#: ../camel/camel-exception.c:264
+#: ../camel/camel-exception.c:262
 msgid "No description available"
 msgstr "Опис недоступний"
 
-#: ../camel/camel-filter-driver.c:786
+#: ../camel/camel-filter-driver.c:785
 #, c-format
 msgid "Failed to create child process '%s': %s"
 msgstr "Не вдається створити дочірній процес '%s': %s"
 
-#: ../camel/camel-filter-driver.c:828
+#: ../camel/camel-filter-driver.c:827
 #, c-format
 msgid "Invalid message stream received from %s: %s"
 msgstr "Отримано неправильний потік повідомлень з %s: %s"
 
-#: ../camel/camel-filter-driver.c:1017 ../camel/camel-filter-driver.c:1026
+#: ../camel/camel-filter-driver.c:1016 ../camel/camel-filter-driver.c:1025
 msgid "Syncing folders"
 msgstr "Синхронізація тек"
 
-#: ../camel/camel-filter-driver.c:1115 ../camel/camel-filter-driver.c:1495
+#: ../camel/camel-filter-driver.c:1114 ../camel/camel-filter-driver.c:1520
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Помилка аналізу фільтра: %s: %s"
 
-#: ../camel/camel-filter-driver.c:1124 ../camel/camel-filter-driver.c:1504
+#: ../camel/camel-filter-driver.c:1123 ../camel/camel-filter-driver.c:1529
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Помилка виконання фільтра: %s: %s"
 
-#: ../camel/camel-filter-driver.c:1192
+#: ../camel/camel-filter-driver.c:1211
 msgid "Unable to open spool folder"
 msgstr "Не вдається відкрити буферну теку"
 
-#: ../camel/camel-filter-driver.c:1201
+#: ../camel/camel-filter-driver.c:1220
 msgid "Unable to process spool folder"
 msgstr "Не вдається обробити буферну теку"
 
-#: ../camel/camel-filter-driver.c:1216
+#: ../camel/camel-filter-driver.c:1236
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "Отримання повідомлення %d (%d%%)"
 
-#: ../camel/camel-filter-driver.c:1220
+#: ../camel/camel-filter-driver.c:1240
 msgid "Cannot open message"
 msgstr "Не вдається відкрити повідомлення"
 
-#: ../camel/camel-filter-driver.c:1221 ../camel/camel-filter-driver.c:1234
+#: ../camel/camel-filter-driver.c:1241 ../camel/camel-filter-driver.c:1259
 #, c-format
 msgid "Failed on message %d"
 msgstr "Помилка на повідомленні %d"
 
-#: ../camel/camel-filter-driver.c:1248 ../camel/camel-filter-driver.c:1339
+#: ../camel/camel-filter-driver.c:1273 ../camel/camel-filter-driver.c:1364
 msgid "Syncing folder"
 msgstr "Синхронізація теки"
 
-#: ../camel/camel-filter-driver.c:1252 ../camel/camel-filter-driver.c:1344
+#: ../camel/camel-filter-driver.c:1277 ../camel/camel-filter-driver.c:1369
 msgid "Complete"
 msgstr "Виконано"
 
-#: ../camel/camel-filter-driver.c:1309
+#: ../camel/camel-filter-driver.c:1334
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "Отримання повідомлення %d з %d"
 
-#: ../camel/camel-filter-driver.c:1324
+#: ../camel/camel-filter-driver.c:1349
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Помилка на повідомленні %d з %d"
 
-#: ../camel/camel-filter-search.c:139
+#: ../camel/camel-filter-search.c:138
 msgid "Failed to retrieve message"
 msgstr "Не вдається знайти повідомлення"
 
-#: ../camel/camel-filter-search.c:402
+#: ../camel/camel-filter-search.c:401
 msgid "Invalid arguments to (system-flag)"
 msgstr "Неправильні аргументи до (system-flag)"
 
-#: ../camel/camel-filter-search.c:417
+#: ../camel/camel-filter-search.c:416
 msgid "Invalid arguments to (user-tag)"
 msgstr "Неправильні аргументи до (user-tag)"
 
-#: ../camel/camel-filter-search.c:582
+#: ../camel/camel-filter-search.c:581
 #, c-format
 msgid "Failed to create create child process '%s': %s"
 msgstr "Не вдається створити дочірній процес '%s': %s"
@@ -1477,7 +1556,8 @@
 msgid "Error executing filter search: %s: %s"
 msgstr "Помилка виконання фільтрованого пошуку: %s: %s"
 
-#: ../camel/camel-folder-search.c:358 ../camel/camel-folder-search.c:480
+#: ../camel/camel-folder-search.c:335 ../camel/camel-folder-search.c:437
+#: ../camel/camel-folder-search.c:574
 #, c-format
 msgid ""
 "Cannot parse search expression: %s:\n"
@@ -1486,7 +1566,8 @@
 "Не вдається проаналізувати пошуковий вираз: %s:\n"
 "%s"
 
-#: ../camel/camel-folder-search.c:368 ../camel/camel-folder-search.c:490
+#: ../camel/camel-folder-search.c:345 ../camel/camel-folder-search.c:447
+#: ../camel/camel-folder-search.c:584
 #, c-format
 msgid ""
 "Error executing search expression: %s:\n"
@@ -1495,72 +1576,72 @@
 "Помилка виконання пошукового виразу: %s:\n"
 "%s"
 
-#: ../camel/camel-folder-search.c:677 ../camel/camel-folder-search.c:712
+#: ../camel/camel-folder-search.c:776 ../camel/camel-folder-search.c:819
 #, c-format
 msgid "(%s) requires a single bool result"
 msgstr "(%s) потребує єдиного логічного результату"
 
-#: ../camel/camel-folder-search.c:765
+#: ../camel/camel-folder-search.c:872
 #, c-format
 msgid "(%s) not allowed inside %s"
 msgstr "(%s) не дозволяється у середині %s"
 
-#: ../camel/camel-folder-search.c:771 ../camel/camel-folder-search.c:778
+#: ../camel/camel-folder-search.c:878 ../camel/camel-folder-search.c:885
 #, c-format
 msgid "(%s) requires a match type string"
 msgstr "(%s) вимагає рядок відповідності"
 
-#: ../camel/camel-folder-search.c:805
+#: ../camel/camel-folder-search.c:912
 #, c-format
 msgid "(%s) expects an array result"
 msgstr "(%s) очікує результат у вигляді масиву"
 
-#: ../camel/camel-folder-search.c:814
+#: ../camel/camel-folder-search.c:921
 #, c-format
 msgid "(%s) requires the folder set"
 msgstr "(%s) потребує встановлення теки"
 
-#: ../camel/camel-folder-search.c:909
+#: ../camel/camel-folder-search.c:1016
 #, c-format
 msgid "Performing query on unknown header: %s"
 msgstr "Запитується невідомий заголовок: %s"
 
-#: ../camel/camel-folder.c:618
+#: ../camel/camel-folder.c:671
 #, c-format
 msgid "Unsupported operation: append message: for %s"
 msgstr "Операція не підтримується: додавання повідомлення: для %s"
 
-#: ../camel/camel-folder.c:1240
+#: ../camel/camel-folder.c:1327
 #, c-format
 msgid "Unsupported operation: search by expression: for %s"
 msgstr "Операція не підтримується: пошук за виразом: для %s"
 
-#: ../camel/camel-folder.c:1281
+#: ../camel/camel-folder.c:1408
 #, c-format
 msgid "Unsupported operation: search by UIDs: for %s"
 msgstr "Операція не підтримується: пошук за UID: для %s"
 
-#: ../camel/camel-folder.c:1397
+#: ../camel/camel-folder.c:1524
 msgid "Moving messages"
 msgstr "Переміщення повідомлень"
 
-#: ../camel/camel-folder.c:1397
+#: ../camel/camel-folder.c:1524
 msgid "Copying messages"
 msgstr "Копіювання повідомлень"
 
-#: ../camel/camel-folder.c:1651
+#: ../camel/camel-folder.c:1870
 msgid "Learning junk"
 msgstr "Триває вивчення брухту"
 
-#: ../camel/camel-folder.c:1668
+#: ../camel/camel-folder.c:1887
 msgid "Learning non-junk"
 msgstr "Триває вивчення не-брухту"
 
-#: ../camel/camel-folder.c:1687
+#: ../camel/camel-folder.c:1906
 msgid "Filtering new message(s)"
 msgstr "Фільтрується нова пошта"
 
-#: ../camel/camel-gpg-context.c:754
+#: ../camel/camel-gpg-context.c:755
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -1571,15 +1652,15 @@
 "\n"
 "%s"
 
-#: ../camel/camel-gpg-context.c:769
+#: ../camel/camel-gpg-context.c:770
 msgid "Failed to parse gpg userid hint."
 msgstr "Не вдається проаналізувати підказку gpg userid."
 
-#: ../camel/camel-gpg-context.c:793 ../camel/camel-gpg-context.c:807
+#: ../camel/camel-gpg-context.c:794 ../camel/camel-gpg-context.c:808
 msgid "Failed to parse gpg passphrase request."
 msgstr "Не вдається проаналізувати запит паролю gpg."
 
-#: ../camel/camel-gpg-context.c:827
+#: ../camel/camel-gpg-context.c:828
 #, c-format
 msgid ""
 "You need a PIN to unlock the key for your\n"
@@ -1588,7 +1669,7 @@
 "Введіть PIN, щоб розблокувати\n"
 "вашу SmartCard: \"%s\""
 
-#: ../camel/camel-gpg-context.c:831
+#: ../camel/camel-gpg-context.c:832
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
@@ -1597,105 +1678,99 @@
 "Введіть ключову фразу, щоб розблокувати\n"
 "ключ користувача: \"%s\""
 
-#: ../camel/camel-gpg-context.c:836
+#: ../camel/camel-gpg-context.c:837
 #, c-format
-msgid "Unexpected request from GnuPG for `%s'"
-msgstr "Неочікувана запит від GnuPG для %s"
+msgid "Unexpected request from GnuPG for '%s'"
+msgstr "Неочікувана запит від GnuPG для '%s'"
 
-#: ../camel/camel-gpg-context.c:861 ../camel/camel-gpg-context.c:1066
-#: ../camel/providers/nntp/camel-nntp-store.c:1281
+#: ../camel/camel-gpg-context.c:862 ../camel/camel-gpg-context.c:1068
+#: ../camel/providers/nntp/camel-nntp-store.c:1287
 msgid "Canceled."
 msgstr "Скасовано."
 
-#: ../camel/camel-gpg-context.c:875
+#: ../camel/camel-gpg-context.c:876
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr "Не вдається відкрити секретний ключ: отримано 3 неправильних пароля."
 
-#: ../camel/camel-gpg-context.c:883
+#: ../camel/camel-gpg-context.c:884
 #, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "Неочікувана відповідь від GnuPG: %s"
 
-#: ../camel/camel-gpg-context.c:936
+#: ../camel/camel-gpg-context.c:937
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr "Не вдається зашифрувати: не визначені коректні отримувачі."
 
 #. always called on an i/o error
-#: ../camel/camel-gpg-context.c:1204 ../camel/camel-gpg-context.c:1332
-#: ../camel/camel-gpg-context.c:1826 ../camel/camel-gpg-context.c:1871
+#: ../camel/camel-gpg-context.c:1206 ../camel/camel-gpg-context.c:1334
+#: ../camel/camel-gpg-context.c:1829 ../camel/camel-gpg-context.c:1874
 #, c-format
 msgid "Failed to execute gpg: %s"
 msgstr "Не вдається виконати gpg: %s"
 
-#: ../camel/camel-gpg-context.c:1300 ../camel/camel-smime-context.c:392
+#: ../camel/camel-gpg-context.c:1302 ../camel/camel-smime-context.c:392
 #, c-format
 msgid "Could not generate signing data: %s"
 msgstr "Не вдається створити підписані дані: %s"
 
-#: ../camel/camel-gpg-context.c:1347 ../camel/camel-gpg-context.c:1531
-#: ../camel/camel-gpg-context.c:1616 ../camel/camel-gpg-context.c:1631
-#: ../camel/camel-gpg-context.c:1748 ../camel/camel-gpg-context.c:1763
-#: ../camel/camel-gpg-context.c:1842 ../camel/camel-gpg-context.c:1887
+#: ../camel/camel-gpg-context.c:1349 ../camel/camel-gpg-context.c:1534
+#: ../camel/camel-gpg-context.c:1619 ../camel/camel-gpg-context.c:1634
+#: ../camel/camel-gpg-context.c:1750 ../camel/camel-gpg-context.c:1765
+#: ../camel/camel-gpg-context.c:1845 ../camel/camel-gpg-context.c:1890
 msgid "Failed to execute gpg."
 msgstr "Не вдається виконати gpg."
 
-#: ../camel/camel-gpg-context.c:1366
+#: ../camel/camel-gpg-context.c:1368
 msgid "This is a digitally signed message part"
 msgstr "Цю частину повідомлення підписано цифровим підписом"
 
-#: ../camel/camel-gpg-context.c:1451 ../camel/camel-gpg-context.c:1457
-#: ../camel/camel-gpg-context.c:1463 ../camel/camel-gpg-context.c:1479
+#: ../camel/camel-gpg-context.c:1453 ../camel/camel-gpg-context.c:1459
+#: ../camel/camel-gpg-context.c:1465 ../camel/camel-gpg-context.c:1480
 #: ../camel/camel-smime-context.c:695 ../camel/camel-smime-context.c:706
 #: ../camel/camel-smime-context.c:713
 msgid "Cannot verify message signature: Incorrect message format"
 msgstr ""
 "Не вдається перевірити підпис повідомлення: неправильний формат повідомлення"
 
-#: ../camel/camel-gpg-context.c:1516
+#: ../camel/camel-gpg-context.c:1519
 #, c-format
 msgid "Cannot verify message signature: could not create temp file: %s"
 msgstr ""
 "Не вдається перевірити підпис повідомлення: не вдалося створити тимчасовий "
 "файл: %s"
 
-#: ../camel/camel-gpg-context.c:1599
+#: ../camel/camel-gpg-context.c:1602
 #, c-format
 msgid "Could not generate encrypting data: %s"
 msgstr "Не вдається створити шифровані дані: %s"
 
-#: ../camel/camel-gpg-context.c:1649
+#: ../camel/camel-gpg-context.c:1652
 msgid "This is a digitally encrypted message part"
 msgstr "Ця частина повідомлення зашифрована"
 
-#: ../camel/camel-gpg-context.c:1702 ../camel/camel-gpg-context.c:1710
-#: ../camel/camel-gpg-context.c:1730
+#: ../camel/camel-gpg-context.c:1705 ../camel/camel-gpg-context.c:1713
+#: ../camel/camel-gpg-context.c:1732
 msgid "Cannot decrypt message: Incorrect message format"
 msgstr ""
 "Не вдається розшифрувати повідомлення: неправильний формат повідомлення"
 
-#: ../camel/camel-gpg-context.c:1719
+#: ../camel/camel-gpg-context.c:1722
 msgid "Failed to decrypt MIME part: protocol error"
 msgstr "Не вдається декодувати секцію MIME: помилка протоколу"
 
-#: ../camel/camel-gpg-context.c:1784 ../camel/camel-smime-context.c:969
+#: ../camel/camel-gpg-context.c:1787 ../camel/camel-smime-context.c:969
 msgid "Encrypted content"
 msgstr "Зашифрований вміст"
 
-#: ../camel/camel-gpg-context.c:1803
+#: ../camel/camel-gpg-context.c:1806
 msgid "Unable to parse message content"
 msgstr "Не вдається розібрати вміст повідомлення"
 
-#: ../camel/camel-gpg-context.c:1827 ../camel/camel-gpg-context.c:1872
+#: ../camel/camel-gpg-context.c:1830 ../camel/camel-gpg-context.c:1875
 #: ../camel/camel-tcp-stream-openssl.c:635
-#: ../camel/providers/imap4/camel-imap4-engine.c:1548
-#: ../camel/providers/imap4/camel-imap4-engine.c:1587
-#: ../camel/providers/imap4/camel-imap4-engine.c:1632
-#: ../camel/providers/imap4/camel-imap4-engine.c:1688
-#: ../camel/providers/imap4/camel-imap4-store.c:820
-#: ../camel/providers/imap4/camel-imap4-store.c:1495
-#: ../camel/providers/imap4/camel-imap4-utils.c:557
-#: ../camel/providers/smtp/camel-smtp-transport.c:164
-#: ../camel/providers/smtp/camel-smtp-transport.c:219
+#: ../camel/providers/imap4/camel-imap4-utils.c:624
+#: ../camel/providers/smtp/camel-smtp-transport.c:166
+#: ../camel/providers/smtp/camel-smtp-transport.c:221
 msgid "Unknown"
 msgstr "Невідоме"
 
@@ -1793,44 +1868,44 @@
 msgid "Error copying mail temp file: %s"
 msgstr "Помилка копіювання тимчасового поштового файлу: %s"
 
-#: ../camel/camel-multipart-signed.c:595
+#: ../camel/camel-multipart-signed.c:593
 msgid "parse error"
 msgstr "помилка обробки"
 
-#: ../camel/camel-net-utils.c:506 ../camel/camel-net-utils.c:668
-#: ../camel/camel-net-utils.c:800
-#: ../camel/providers/pop3/camel-pop3-store.c:449
-#: ../camel/providers/pop3/camel-pop3-store.c:553
+#: ../camel/camel-net-utils.c:505 ../camel/camel-net-utils.c:667
+#: ../camel/camel-net-utils.c:799
+#: ../camel/providers/pop3/camel-pop3-store.c:447
+#: ../camel/providers/pop3/camel-pop3-store.c:547
 msgid "Canceled"
 msgstr "Скасовано"
 
-#: ../camel/camel-net-utils.c:525
+#: ../camel/camel-net-utils.c:524
 msgid "cannot create thread"
 msgstr "не вдається створити потік"
 
-#: ../camel/camel-net-utils.c:672
+#: ../camel/camel-net-utils.c:671
 #, c-format
 msgid "Resolving: %s"
 msgstr "Пошук вузла: %s"
 
-#: ../camel/camel-net-utils.c:694
+#: ../camel/camel-net-utils.c:693
 msgid "Host lookup failed"
 msgstr "Помилка пошуку вузла"
 
-#: ../camel/camel-net-utils.c:696
+#: ../camel/camel-net-utils.c:695
 #, c-format
 msgid "Host lookup failed: %s: %s"
 msgstr "Помилка пошуку вузла: %s: %s"
 
-#: ../camel/camel-net-utils.c:804
+#: ../camel/camel-net-utils.c:803
 msgid "Resolving address"
 msgstr "Пошук адреси"
 
-#: ../camel/camel-net-utils.c:824
+#: ../camel/camel-net-utils.c:823
 msgid "Name lookup failed"
 msgstr "Не вдається визначити порт"
 
-#: ../camel/camel-net-utils.c:827
+#: ../camel/camel-net-utils.c:826
 #, c-format
 msgid "Name lookup failed: %s"
 msgstr "Не вдається визначити вузол: %s"
@@ -1842,35 +1917,35 @@
 
 #: ../camel/camel-offline-journal.c:164 ../camel/camel-offline-journal.c:187
 #, c-format
-msgid "Cannot write offline journal for folder `%s': %s"
+msgid "Cannot write offline journal for folder '%s': %s"
 msgstr "Не вдається записати журнал автономної роботи для теки \"%s\": %s"
 
-#: ../camel/camel-provider.c:62
+#: ../camel/camel-provider.c:60
 msgid "Virtual folder email provider"
 msgstr "Постачальник віртуальних папок ел.пошти"
 
-#: ../camel/camel-provider.c:64
+#: ../camel/camel-provider.c:62
 msgid "For reading mail as a query of another set of folders"
 msgstr "Для читання пошти як запиту до іншого набору тек"
 
-#: ../camel/camel-provider.c:187
+#: ../camel/camel-provider.c:184
 #, c-format
 msgid "Could not load %s: Module loading not supported on this system."
 msgstr "Не вдається завантажити %s: Завантаження модулів не підтримується."
 
-#: ../camel/camel-provider.c:196
+#: ../camel/camel-provider.c:193
 #, c-format
 msgid "Could not load %s: %s"
 msgstr "Не вдається завантажити %s: %s"
 
-#: ../camel/camel-provider.c:204
+#: ../camel/camel-provider.c:201
 #, c-format
 msgid "Could not load %s: No initialization code in module."
 msgstr "Не вдається завантажити %s: в модулі немає коду ініціалізації."
 
-#: ../camel/camel-provider.c:376 ../camel/camel-session.c:177
+#: ../camel/camel-provider.c:373 ../camel/camel-session.c:177
 #, c-format
-msgid "No provider available for protocol `%s'"
+msgid "No provider available for protocol '%s'"
 msgstr "Постачальник протоколу \"%s\" недоступний"
 
 #: ../camel/camel-sasl-anonymous.c:37
@@ -1912,11 +1987,11 @@
 "Неправильна інформація про трасування:\n"
 "%s"
 
-#: ../camel/camel-sasl-cram-md5.c:40
+#: ../camel/camel-sasl-cram-md5.c:38
 msgid "CRAM-MD5"
 msgstr "CRAM-MD5"
 
-#: ../camel/camel-sasl-cram-md5.c:42
+#: ../camel/camel-sasl-cram-md5.c:40
 msgid ""
 "This option will connect to the server using a secure CRAM-MD5 password, if "
 "the server supports it."
@@ -1924,11 +1999,11 @@
 "З'єднуватись з сервером використовуючи протокол ідентифікації CRAM-MD5, якщо "
 "сервер його підтримує."
 
-#: ../camel/camel-sasl-digest-md5.c:50
+#: ../camel/camel-sasl-digest-md5.c:48
 msgid "DIGEST-MD5"
 msgstr "DIGEST-MD5"
 
-#: ../camel/camel-sasl-digest-md5.c:52
+#: ../camel/camel-sasl-digest-md5.c:50
 msgid ""
 "This option will connect to the server using a secure DIGEST-MD5 password, "
 "if the server supports it."
@@ -1936,27 +2011,27 @@
 "З'єднуватись з сервером використовуючи зашифрованого пароля DIGEST-MD5, якщо "
 "сервер його підтримує."
 
-#: ../camel/camel-sasl-digest-md5.c:820
+#: ../camel/camel-sasl-digest-md5.c:845
 msgid "Server challenge too long (>2048 octets)"
 msgstr "Відповідь сервера надто довга (>2048 байт)"
 
-#: ../camel/camel-sasl-digest-md5.c:829
+#: ../camel/camel-sasl-digest-md5.c:854
 msgid "Server challenge invalid\n"
 msgstr "Неправильна відповідь сервера\n"
 
-#: ../camel/camel-sasl-digest-md5.c:835
+#: ../camel/camel-sasl-digest-md5.c:860
 msgid "Server challenge contained invalid \"Quality of Protection\" token"
 msgstr "Відповідь сервера містить неправильну лексему \"Якість захисту\""
 
-#: ../camel/camel-sasl-digest-md5.c:865
+#: ../camel/camel-sasl-digest-md5.c:890
 msgid "Server response did not contain authorization data"
 msgstr "Відповідь сервера не містить інформації про авторизацію"
 
-#: ../camel/camel-sasl-digest-md5.c:883
+#: ../camel/camel-sasl-digest-md5.c:908
 msgid "Server response contained incomplete authorization data"
 msgstr "Відповідь сервера містить неповну інформацію про авторизацію"
 
-#: ../camel/camel-sasl-digest-md5.c:893
+#: ../camel/camel-sasl-digest-md5.c:918
 msgid "Server response does not match"
 msgstr "Неправильна відповідь сервера"
 
@@ -2031,7 +2106,7 @@
 #: ../camel/camel-sasl-gssapi.c:205 ../camel/camel-sasl-gssapi.c:253
 #: ../camel/camel-sasl-gssapi.c:289 ../camel/camel-sasl-gssapi.c:304
 #: ../camel/camel-sasl-kerberos4.c:231
-#: ../camel/providers/imap/camel-imap-store.c:1317
+#: ../camel/providers/imap/camel-imap-store.c:1273
 msgid "Bad authentication response from server."
 msgstr "Неправильна автентифікація від сервера."
 
@@ -2104,22 +2179,22 @@
 msgid "POP Before SMTP auth using a non-pop source"
 msgstr "POP до SMTP авторизація використовує не POP джерело"
 
-#: ../camel/camel-search-private.c:150
+#: ../camel/camel-search-private.c:149
 #, c-format
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "Помилка при компіляції регулярного виразу: %s: %s"
 
-#: ../camel/camel-service.c:272
+#: ../camel/camel-service.c:270
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr "URL '%s' потребує компоненту імені користувача"
 
-#: ../camel/camel-service.c:276
+#: ../camel/camel-service.c:274
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr "URL '%s' потребує компоненту назви вузла"
 
-#: ../camel/camel-service.c:280
+#: ../camel/camel-service.c:278
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr "URL '%s' потребує компоненту шляху"
@@ -2138,7 +2213,7 @@
 msgid "Please enter the %s password for %s on host %s."
 msgstr "Введіть пароль %s для %s на вузлі %s."
 
-#: ../camel/camel-smime-context.c:234
+#: ../camel/camel-smime-context.c:234 ../camel/camel-smime-context.c:778
 #, c-format
 msgid "Cannot find certificate for '%s'"
 msgstr "Не вдається знайти сертифікат для '%s'"
@@ -2287,11 +2362,6 @@
 msgid "Decoder failed"
 msgstr "Помилка дешифратора"
 
-#: ../camel/camel-smime-context.c:778
-#, c-format
-msgid "Cannot find certificate for `%s'"
-msgstr "Не вдається знайти сертифікат для `%s'"
-
 #: ../camel/camel-smime-context.c:785
 msgid "Cannot find common bulk encryption algorithm"
 msgstr "Не вдається знайти алгоритм загального блочного шифрування"
@@ -2346,45 +2416,45 @@
 msgid "export keys: unimplemented"
 msgstr "експорт ключів: не реалізовано"
 
-#: ../camel/camel-store.c:219
+#: ../camel/camel-store.c:283
 #: ../camel/providers/groupwise/camel-groupwise-transport.c:174
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr "Не вдається отримати теку: неприпустима операція у цьому сховищі"
 
-#: ../camel/camel-store.c:252
+#: ../camel/camel-store.c:316
 #, c-format
-msgid "Cannot create folder `%s': folder exists"
+msgid "Cannot create folder '%s': folder exists"
 msgstr "Не вдається створити теку: \"%s\": тека вже існує"
 
-#: ../camel/camel-store.c:316
+#: ../camel/camel-store.c:380
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "Не вдається створити теку: неприпустима операція у цьому сховищі"
 
-#: ../camel/camel-store.c:344
+#: ../camel/camel-store.c:408
 #, c-format
 msgid "Cannot create folder: %s: folder exists"
 msgstr "Не вдається створити теку: %s тека вже існує"
 
-#: ../camel/camel-store.c:408 ../camel/camel-vee-store.c:369
-#: ../camel/providers/local/camel-maildir-store.c:218
+#: ../camel/camel-store.c:472 ../camel/camel-vee-store.c:384
+#: ../camel/providers/local/camel-maildir-store.c:219
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Не вдається видалити теку: %s: недопустима операція"
 
-#: ../camel/camel-store.c:458 ../camel/camel-vee-store.c:406
-#: ../camel/providers/local/camel-maildir-store.c:290
+#: ../camel/camel-store.c:529 ../camel/camel-vee-store.c:421
+#: ../camel/providers/local/camel-maildir-store.c:291
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "Не вдається перейменувати теку: %s: неправильна операція"
 
 #. the name of the Trash folder, used for deleted messages
-#: ../camel/camel-store.c:799 ../camel/camel-vtrash-folder.c:52
-#: ../camel/providers/imap/camel-imap-store.c:1077
+#: ../camel/camel-store.c:872 ../camel/camel-vtrash-folder.c:54
+#: ../camel/providers/imap/camel-imap-store.c:1061
 msgid "Trash"
 msgstr "Смітник"
 
 #. the name of the Junk folder, used for spam messages
-#: ../camel/camel-store.c:802 ../camel/camel-vtrash-folder.c:54
+#: ../camel/camel-store.c:875 ../camel/camel-vtrash-folder.c:56
 msgid "Junk"
 msgstr "Спам"
 
@@ -2504,7 +2574,7 @@
 msgid "Error in application verification"
 msgstr "Помилка при перевірці додатку"
 
-#: ../camel/camel-tcp-stream-openssl.c:700 ../camel/camel-tcp-stream-ssl.c:871
+#: ../camel/camel-tcp-stream-openssl.c:700 ../camel/camel-tcp-stream-ssl.c:880
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -2517,11 +2587,11 @@
 "Відбиток:       %s\n"
 "Підпис:         %s"
 
-#: ../camel/camel-tcp-stream-openssl.c:706 ../camel/camel-tcp-stream-ssl.c:877
+#: ../camel/camel-tcp-stream-openssl.c:706 ../camel/camel-tcp-stream-ssl.c:886
 msgid "GOOD"
 msgstr "ПРАВИЛЬНИЙ"
 
-#: ../camel/camel-tcp-stream-openssl.c:706 ../camel/camel-tcp-stream-ssl.c:877
+#: ../camel/camel-tcp-stream-openssl.c:706 ../camel/camel-tcp-stream-ssl.c:886
 msgid "BAD"
 msgstr "НЕПРАВИЛЬНИЙ"
 
@@ -2545,7 +2615,7 @@
 "Бажаєте прийняти його?"
 
 #. construct our user prompt
-#: ../camel/camel-tcp-stream-ssl.c:881
+#: ../camel/camel-tcp-stream-ssl.c:890
 #, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -2560,7 +2630,7 @@
 "\n"
 "Бажаєте прийняти його?"
 
-#: ../camel/camel-tcp-stream-ssl.c:925
+#: ../camel/camel-tcp-stream-ssl.c:934
 #, c-format
 msgid ""
 "Certificate problem: %s\n"
@@ -2569,7 +2639,7 @@
 "Проблема з сертифікатом: %s\n"
 "Подавець: %s"
 
-#: ../camel/camel-tcp-stream-ssl.c:977
+#: ../camel/camel-tcp-stream-ssl.c:986
 #, c-format
 msgid ""
 "Bad certificate domain: %s\n"
@@ -2578,7 +2648,7 @@
 "Сертифікат має неправильний домен: %s\n"
 "Подавець: %s"
 
-#: ../camel/camel-tcp-stream-ssl.c:995
+#: ../camel/camel-tcp-stream-ssl.c:1004
 #, c-format
 msgid ""
 "Certificate expired: %s\n"
@@ -2587,7 +2657,7 @@
 "Термін дії сертифікату закінчився: %s\n"
 "Подавець: %s"
 
-#: ../camel/camel-tcp-stream-ssl.c:1012
+#: ../camel/camel-tcp-stream-ssl.c:1021
 #, c-format
 msgid ""
 "Certificate revocation list expired: %s\n"
@@ -2598,48 +2668,48 @@
 
 #: ../camel/camel-url.c:313
 #, c-format
-msgid "Could not parse URL `%s'"
+msgid "Could not parse URL '%s'"
 msgstr "Не вдається проаналізувати URL \"%s\""
 
-#: ../camel/camel-vee-folder.c:482
+#: ../camel/camel-vee-folder.c:587
 #, c-format
-msgid "Error storing `%s': %s"
-msgstr "Помилка при зберіганні \"%s\": %s"
+msgid "Error storing '%s': %s"
+msgstr "Помилка при збереженні \"%s\": %s"
 
-#: ../camel/camel-vee-folder.c:524
+#: ../camel/camel-vee-folder.c:640
 #, c-format
 msgid "No such message %s in %s"
 msgstr "Немає повідомлення %s у %s"
 
-#: ../camel/camel-vee-folder.c:649 ../camel/camel-vee-folder.c:655
+#: ../camel/camel-vee-folder.c:800 ../camel/camel-vee-folder.c:806
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr ""
 "Не вдається скопіювати або перемістити повідомлення до віртуальної теки"
 
-#: ../camel/camel-vee-store.c:102 ../camel/camel-vee-store.c:345
+#: ../camel/camel-vee-store.c:114 ../camel/camel-vee-store.c:115
+#: ../camel/camel-vee-store.c:360
 msgid "Unmatched"
 msgstr "Інше"
 
-#: ../camel/camel-vee-store.c:392
+#: ../camel/camel-vee-store.c:407
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Не вдається видалити теку: %s: немає такої теки"
 
-#: ../camel/camel-vee-store.c:414
+#: ../camel/camel-vee-store.c:429
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Не вдається перейменувати теку: %s: немає такої теки"
 
-#: ../camel/camel-vtrash-folder.c:53
+#: ../camel/camel-vtrash-folder.c:55
 msgid "Cannot copy messages to the Trash folder"
 msgstr "Не вдається скопіювати повідомлення у теку \"Смітник\""
 
-#: ../camel/camel-vtrash-folder.c:55
+#: ../camel/camel-vtrash-folder.c:57
 msgid "Cannot copy messages to the Junk folder"
 msgstr "Не вдається скопіювати повідомлення у теку \"Спам\""
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:118
-#: ../camel/providers/imap/camel-imap-folder.c:2167
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:119
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
@@ -2648,115 +2718,115 @@
 "Не вдається отримати повідомлення: %s\n"
 "  %s"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:118
-#: ../camel/providers/imap/camel-imap-folder.c:2167
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:119
 #: ../camel/providers/local/camel-maildir-folder.c:251
 #: ../camel/providers/local/camel-mbox-folder.c:348
 #: ../camel/providers/local/camel-mh-folder.c:204
 msgid "No such message"
 msgstr "Немає такого повідомлення"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:130
-#: ../camel/providers/imap4/camel-imap4-folder.c:791
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:131
+#: ../camel/providers/imap4/camel-imap4-folder.c:812
 #: ../camel/providers/nntp/camel-nntp-folder.c:156
 #: ../camel/providers/nntp/camel-nntp-folder.c:232
-#: ../camel/providers/nntp/camel-nntp-folder.c:371
-#: ../camel/providers/pop3/camel-pop3-folder.c:262
-#: ../camel/providers/pop3/camel-pop3-folder.c:518
-#: ../camel/providers/pop3/camel-pop3-folder.c:579
-#: ../camel/providers/pop3/camel-pop3-folder.c:597
+#: ../camel/providers/nntp/camel-nntp-folder.c:392
+#: ../camel/providers/pop3/camel-pop3-folder.c:266
+#: ../camel/providers/pop3/camel-pop3-folder.c:559
+#: ../camel/providers/pop3/camel-pop3-folder.c:620
+#: ../camel/providers/pop3/camel-pop3-folder.c:638
 msgid "User canceled"
 msgstr "Скасовано користувачем"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:137
-#: ../camel/providers/imap4/camel-imap4-folder.c:796
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:138
+#: ../camel/providers/imap4/camel-imap4-folder.c:817
 #: ../camel/providers/nntp/camel-nntp-folder.c:147
 #: ../camel/providers/nntp/camel-nntp-folder.c:149
 #: ../camel/providers/nntp/camel-nntp-folder.c:158
 #: ../camel/providers/nntp/camel-nntp-folder.c:234
-#: ../camel/providers/pop3/camel-pop3-folder.c:521
-#: ../camel/providers/pop3/camel-pop3-folder.c:582
-#: ../camel/providers/pop3/camel-pop3-folder.c:589
-#: ../camel/providers/pop3/camel-pop3-folder.c:600
+#: ../camel/providers/pop3/camel-pop3-folder.c:386
+#: ../camel/providers/pop3/camel-pop3-folder.c:562
+#: ../camel/providers/pop3/camel-pop3-folder.c:623
+#: ../camel/providers/pop3/camel-pop3-folder.c:630
+#: ../camel/providers/pop3/camel-pop3-folder.c:641
 #, c-format
 msgid "Cannot get message %s: %s"
 msgstr "Не вдається отримати повідомлення %s: %s"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:154
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:162
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2141
-#: ../camel/providers/imap4/camel-imap4-folder.c:814
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:155
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:163
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2222
+#: ../camel/providers/imap4/camel-imap4-folder.c:835
 msgid "This message is not available in offline mode."
 msgstr "Це повідомлення недоступне у автономному режимі."
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:173
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:180
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1690
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1737
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:175
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:182
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1745
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1796
 msgid "Could not get message"
 msgstr "Не вдається отримати повідомлення."
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:816
-#: ../camel/providers/imap/camel-imap-folder.c:265
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:841
+#: ../camel/providers/imap/camel-imap-folder.c:251
 #, c-format
 msgid "Could not load summary for %s"
 msgstr "Не вдається завантажити зведення про %s"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1065
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1094
 msgid "Trash Folder Full. Please Empty."
 msgstr "Тека смітника переповнена. Очистіть її."
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1242
-#: ../camel/providers/groupwise/camel-groupwise-store.c:623
-#: ../camel/providers/groupwise/camel-groupwise-store.c:736
-#: ../camel/providers/imap/camel-imap-folder.c:2538
-#: ../camel/providers/imap/camel-imap-folder.c:2608
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1287
+#: ../camel/providers/groupwise/camel-groupwise-store.c:609
+#: ../camel/providers/groupwise/camel-groupwise-store.c:735
+#: ../camel/providers/imap/camel-imap-folder.c:3228
+#: ../camel/providers/imap/camel-imap-folder.c:3304
 #, c-format
 msgid "Fetching summary information for new messages in %s"
 msgstr "Отримання відомостей про нові повідомлення на %s"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2008
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2050
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2080
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2122
 #, c-format
-msgid "Cannot append message to folder `%s': %s"
-msgstr "Не вдається додати повідомлення у теку: %s: %s"
+msgid "Cannot append message to folder '%s': %s"
+msgstr "Не вдається додати повідомлення до теки: «%s»: %s"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2038
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2110
 #, c-format
 msgid "Cannot create message: %s"
 msgstr "Не вдається створити повідомлення: %s"
 
-#: ../camel/providers/groupwise/camel-groupwise-journal.c:284
+#: ../camel/providers/groupwise/camel-groupwise-journal.c:285
 #, c-format
 msgid "Cannot get folder container %s"
 msgstr "Не вдається отримати контейнер теки %s"
 
-#: ../camel/providers/groupwise/camel-groupwise-journal.c:348
+#: ../camel/providers/groupwise/camel-groupwise-journal.c:349
 #: ../camel/providers/imap4/camel-imap4-journal.c:319
 msgid "Cannot append message in offline mode: cache unavailable"
 msgstr "Не вдається додати повідомлення у автономному режимі: кеш недоступний"
 
-#: ../camel/providers/groupwise/camel-groupwise-journal.c:364
+#: ../camel/providers/groupwise/camel-groupwise-journal.c:365
 #: ../camel/providers/imap4/camel-imap4-journal.c:335
 #, c-format
 msgid "Cannot append message in offline mode: %s"
 msgstr "Не вдається додати повідомлення у автономному режимі: %s"
 
 #: ../camel/providers/groupwise/camel-groupwise-provider.c:55
-#: ../camel/providers/imap4/camel-imap4-provider.c:38
+#: ../camel/providers/imap4/camel-imap4-provider.c:39
 msgid "Checking for new mail"
 msgstr "Перевіряти нову пошту"
 
 #: ../camel/providers/groupwise/camel-groupwise-provider.c:57
 #: ../camel/providers/hula/camel-hula-provider.c:51
 #: ../camel/providers/imap/camel-imap-provider.c:46
-#: ../camel/providers/imap4/camel-imap4-provider.c:40
+#: ../camel/providers/imap4/camel-imap4-provider.c:41
 msgid "C_heck for new messages in all folders"
 msgstr "П_еревіряти нову пошту в усіх теках"
 
 #: ../camel/providers/groupwise/camel-groupwise-provider.c:60
-#: ../camel/providers/imap/camel-imap-provider.c:66
-#: ../camel/providers/imap4/camel-imap4-provider.c:51
+#: ../camel/providers/imap/camel-imap-provider.c:68
+#: ../camel/providers/imap4/camel-imap4-provider.c:52
 #: ../camel/providers/local/camel-local-provider.c:46
 #: ../camel/providers/local/camel-local-provider.c:86
 #: ../camel/providers/local/camel-local-provider.c:106
@@ -2773,7 +2843,7 @@
 msgstr "Перевіряти, чи є нові повідомлення с_памом"
 
 #: ../camel/providers/groupwise/camel-groupwise-provider.c:66
-#: ../camel/providers/imap/camel-imap-provider.c:72
+#: ../camel/providers/imap/camel-imap-provider.c:74
 msgid "Only check for Junk messages in the IN_BOX folder"
 msgstr "Перевіряти, чи є нові повідомлення спамом, _лише у теці \"Вхідні\""
 
@@ -2799,8 +2869,8 @@
 
 #: ../camel/providers/groupwise/camel-groupwise-provider.c:106
 #: ../camel/providers/hula/camel-hula-provider.c:95
-#: ../camel/providers/imap/camel-imap-provider.c:98
-#: ../camel/providers/imap4/camel-imap4-provider.c:83
+#: ../camel/providers/imap/camel-imap-provider.c:100
+#: ../camel/providers/imap4/camel-imap4-provider.c:84
 #: ../camel/providers/imapp/camel-imapp-provider.c:67
 #: ../camel/providers/nntp/camel-nntp-provider.c:74
 #: ../camel/providers/pop3/camel-pop3-provider.c:72
@@ -2812,49 +2882,49 @@
 "This option will connect to the GroupWise server using a plaintext password."
 msgstr "З'єднуватись з сервером IMAP використовуючи нешифрований пароль."
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:103
+#: ../camel/providers/groupwise/camel-groupwise-store.c:104
 msgid "Host or user not available in url"
 msgstr "Вузол або користувач недоступні в url"
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:206
-#: ../camel/providers/imap/camel-imap-store.c:1401
+#: ../camel/providers/groupwise/camel-groupwise-store.c:207
+#: ../camel/providers/imap/camel-imap-store.c:1357
 msgid "You did not enter a password."
 msgstr "Ви не ввели пароль."
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:302
+#: ../camel/providers/groupwise/camel-groupwise-store.c:303
 msgid "Some features may not work correctly with your current server version"
 msgstr "Деякі функції можуть працювати некоректно з вашою версією сервера"
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:532
-#: ../camel/providers/imap/camel-imap-store.c:1912
-#: ../camel/providers/imap/camel-imap-store.c:2103
+#: ../camel/providers/groupwise/camel-groupwise-store.c:518
+#: ../camel/providers/imap/camel-imap-store.c:1849
+#: ../camel/providers/imap/camel-imap-store.c:2047
 #, c-format
 msgid "No such folder %s"
 msgstr "Немає такої теки \"%s\""
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1217
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1233
 msgid "Cannot create GroupWise folders in offline mode."
 msgstr "Не можна створювати теку GroupWise у автономному режимі."
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1231
-#: ../camel/providers/imap/camel-imap-store.c:1987
-#: ../camel/providers/imap/camel-imap-store.c:2356
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1247
+#: ../camel/providers/imap/camel-imap-store.c:1924
+#: ../camel/providers/imap/camel-imap-store.c:2304
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "Батьківська тека не дозволяє розміщувати підтеки"
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1307
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1328
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1323
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1344
 #, c-format
-msgid "Cannot rename Groupwise folder `%s' to `%s'"
-msgstr "Не вдається перейменувати теку GroupWise `%s' на `%s'"
+msgid "Cannot rename Groupwise folder '%s' to '%s'"
+msgstr "Не вдається перейменувати теку GroupWise «%s»  на «%s»"
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1360
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1376
 #: ../camel/providers/groupwise/camel-groupwise-transport.c:121
 #, c-format
 msgid "GroupWise server %s"
 msgstr "Сервер GroupWise %s"
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1362
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1378
 #, c-format
 msgid "GroupWise service for %s on %s"
 msgstr "Служба GroupWise для %s на %s"
@@ -2891,36 +2961,36 @@
 msgstr "Перевірка нової пошти"
 
 #: ../camel/providers/hula/camel-hula-provider.c:54
-#: ../camel/providers/imap/camel-imap-provider.c:50
+#: ../camel/providers/imap/camel-imap-provider.c:52
 msgid "Connection to Server"
 msgstr "З'єднання з сервером"
 
 #: ../camel/providers/hula/camel-hula-provider.c:56
-#: ../camel/providers/imap/camel-imap-provider.c:52
+#: ../camel/providers/imap/camel-imap-provider.c:54
 msgid "_Use custom command to connect to server"
 msgstr "_Використовувати власний рядок для з'єднання х сервером"
 
 #: ../camel/providers/hula/camel-hula-provider.c:58
-#: ../camel/providers/imap/camel-imap-provider.c:54
+#: ../camel/providers/imap/camel-imap-provider.c:56
 msgid "Command:"
 msgstr "Команда:"
 
 #: ../camel/providers/hula/camel-hula-provider.c:61
-#: ../camel/providers/imap/camel-imap-provider.c:58
-#: ../camel/providers/imap4/camel-imap4-provider.c:43
+#: ../camel/providers/imap/camel-imap-provider.c:60
+#: ../camel/providers/imap4/camel-imap4-provider.c:44
 #: ../camel/providers/nntp/camel-nntp-provider.c:44
 msgid "Folders"
 msgstr "Теки"
 
 #: ../camel/providers/hula/camel-hula-provider.c:63
-#: ../camel/providers/imap/camel-imap-provider.c:60
-#: ../camel/providers/imap4/camel-imap4-provider.c:45
+#: ../camel/providers/imap/camel-imap-provider.c:62
+#: ../camel/providers/imap4/camel-imap4-provider.c:46
 msgid "_Show only subscribed folders"
 msgstr "_Показувати лише підписані теки"
 
 #: ../camel/providers/hula/camel-hula-provider.c:65
-#: ../camel/providers/imap/camel-imap-provider.c:62
-#: ../camel/providers/imap4/camel-imap4-provider.c:47
+#: ../camel/providers/imap/camel-imap-provider.c:64
+#: ../camel/providers/imap4/camel-imap4-provider.c:48
 msgid "O_verride server-supplied folder namespace"
 msgstr "За_мінити запропонований сервером простір назв тек"
 
@@ -2940,22 +3010,32 @@
 msgid "This option will connect to the Hula server using a plaintext password."
 msgstr "З'єднання сервером Hula буде виконуватись з нешифрованим паролем."
 
-#: ../camel/providers/imap/camel-imap-command.c:224
-#: ../camel/providers/imap/camel-imap-command.c:266
-#: ../camel/providers/imap/camel-imap-command.c:472
-#: ../camel/providers/imap/camel-imap-store.c:3058
+#: ../camel/providers/imap/camel-imap-command.c:183
+#: ../camel/providers/imap/camel-imap-command.c:267
+msgid "No output stream"
+msgstr "Відсутній потік виводу"
+
+#: ../camel/providers/imap/camel-imap-command.c:188
+#: ../camel/providers/imap/camel-imap-command.c:272
+msgid "No input stream"
+msgstr "Відсутній потік вводу"
+
+#: ../camel/providers/imap/camel-imap-command.c:231
+#: ../camel/providers/imap/camel-imap-command.c:280
+#: ../camel/providers/imap/camel-imap-command.c:494
+#: ../camel/providers/imap/camel-imap-store.c:3037
 msgid "Operation cancelled"
 msgstr "Операцію скасовано"
 
-#: ../camel/providers/imap/camel-imap-command.c:311
-#: ../camel/providers/imap/camel-imap-store.c:3061
+#: ../camel/providers/imap/camel-imap-command.c:333
+#: ../camel/providers/imap/camel-imap-store.c:3040
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Сервер несподівано розірвав з'єднання: %s"
 
 #. for imap ALERT codes, account user@host
 #. we might get a ']' from a BAD response since we +12, but who cares?
-#: ../camel/providers/imap/camel-imap-command.c:332
+#: ../camel/providers/imap/camel-imap-command.c:354
 #, c-format
 msgid ""
 "Alert from IMAP server %s@%s:\n"
@@ -2964,241 +3044,258 @@
 "Повідомлення із застереженням з IMAP серверу %s@%s:\n"
 "%s"
 
-#: ../camel/providers/imap/camel-imap-command.c:401
+#: ../camel/providers/imap/camel-imap-command.c:423
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "Неочікувана відповідь від сервера IMAP: %s"
 
-#: ../camel/providers/imap/camel-imap-command.c:411
+#: ../camel/providers/imap/camel-imap-command.c:433
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr "Збій команди IMAP: %s"
 
-#: ../camel/providers/imap/camel-imap-command.c:486
+#: ../camel/providers/imap/camel-imap-command.c:508
 msgid "Server response ended too soon."
 msgstr "Неповна відповідь сервера."
 
-#: ../camel/providers/imap/camel-imap-command.c:693
+#: ../camel/providers/imap/camel-imap-command.c:715
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr "Відповідь сервера IMAP не містить інформації про %s"
 
-#: ../camel/providers/imap/camel-imap-command.c:729
+#: ../camel/providers/imap/camel-imap-command.c:751
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "Неочікувана відповідь \"OK\" від сервера IMAP: %s"
 
-#: ../camel/providers/imap/camel-imap-folder.c:87
+#: ../camel/providers/imap/camel-imap-folder.c:89
 msgid "Always check for new mail in this folder"
 msgstr "Завжди перевіряти нову пошту в цій теці"
 
-#: ../camel/providers/imap/camel-imap-folder.c:246
+#: ../camel/providers/imap/camel-imap-folder.c:232
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "Не вдається створити каталог %s: %s"
 
-#: ../camel/providers/imap/camel-imap-folder.c:350
-msgid "Folder was destroyed and recreated on server."
-msgstr "Теку було знищено і повторно створено на сервері."
-
 #. Check UIDs and flags of all messages we already know of.
-#: ../camel/providers/imap/camel-imap-folder.c:682
+#: ../camel/providers/imap/camel-imap-folder.c:847
 #, c-format
 msgid "Scanning for changed messages in %s"
 msgstr "Пошук змінених повідомлень на %s"
 
-#: ../camel/providers/imap/camel-imap-folder.c:2127
+#: ../camel/providers/imap/camel-imap-folder.c:1885
+#, c-format
+msgid "Unexpected response status '%s' after APPEND command"
+msgstr "Неочікуваний статус «%s» у відповіді на команду APPEND"
+
+#: ../camel/providers/imap/camel-imap-folder.c:1900
+msgid "No response on continuation after APPEND command"
+msgstr "Відсутня відповідь або продовження після команди APPEND"
+
+#: ../camel/providers/imap/camel-imap-folder.c:1942
+msgid "Unknown error occurred during APPEND command!"
+msgstr "Під час виконання команди APPEND виникла невідома помилка!"
+
+#: ../camel/providers/imap/camel-imap-folder.c:2772
 #, c-format
 msgid "Unable to retrieve message: %s"
 msgstr "Не вдається знайти повідомлення: %s"
 
-#: ../camel/providers/imap/camel-imap-folder.c:2206
-#: ../camel/providers/imap/camel-imap-folder.c:2892
+#: ../camel/providers/imap/camel-imap-folder.c:2813
+#, c-format
+msgid "Cannot get message with message ID %s: %s"
+msgstr "Не вдається отримати повідомлення з ідентифікатором %s: %s"
+
+#: ../camel/providers/imap/camel-imap-folder.c:2814
+msgid "No such message available."
+msgstr "Немає такого повідомлення."
+
+#: ../camel/providers/imap/camel-imap-folder.c:2853
+#: ../camel/providers/imap/camel-imap-folder.c:3606
 #: ../camel/providers/nntp/camel-nntp-folder.c:220
 msgid "This message is not currently available"
 msgstr "Цього повідомлення наразі недоступне"
 
-#: ../camel/providers/imap/camel-imap-folder.c:2727
+#: ../camel/providers/imap/camel-imap-folder.c:3433
 #, c-format
 msgid "Incomplete server response: no information provided for message %d"
 msgstr "Відповідь сервера неповна: не надана інформація про повідомлення %d"
 
-#: ../camel/providers/imap/camel-imap-folder.c:2735
+#: ../camel/providers/imap/camel-imap-folder.c:3441
 #, c-format
 msgid "Incomplete server response: no UID provided for message %d"
 msgstr "Відповідь сервера неповна: не надано UID для повідомлення %d"
 
-#: ../camel/providers/imap/camel-imap-folder.c:2748
-#, c-format
-msgid ""
-"Unexpected server response: Identical UIDs provided for messages %d and %d"
-msgstr "Неочікувана відповідь сервера: однакові UID для повідомлень %d та %d"
-
-#: ../camel/providers/imap/camel-imap-folder.c:2930
+#: ../camel/providers/imap/camel-imap-folder.c:3644
 msgid "Could not find message body in FETCH response."
 msgstr "Не вдається знайти тіла повідомлення у відповіді на FETCH."
 
 #: ../camel/providers/imap/camel-imap-message-cache.c:161
+#: ../camel/providers/imap/camel-imap-message-cache.c:225
 #, c-format
 msgid "Could not open cache directory: %s"
 msgstr "Не вдається відкрити каталог кешу: %s"
 
-#: ../camel/providers/imap/camel-imap-message-cache.c:267
-#: ../camel/providers/imap/camel-imap-message-cache.c:324
-#: ../camel/providers/imap/camel-imap-message-cache.c:355
-#: ../camel/providers/imap/camel-imap-message-cache.c:387
+#: ../camel/providers/imap/camel-imap-message-cache.c:312
+#: ../camel/providers/imap/camel-imap-message-cache.c:369
+#: ../camel/providers/imap/camel-imap-message-cache.c:400
+#: ../camel/providers/imap/camel-imap-message-cache.c:432
 #, c-format
 msgid "Failed to cache message %s: %s"
 msgstr "Збій кешування повідомлення %s: %s"
 
-#: ../camel/providers/imap/camel-imap-message-cache.c:438
+#: ../camel/providers/imap/camel-imap-message-cache.c:483
 #, c-format
 msgid "Failed to cache %s: %s"
 msgstr "Не вдається зберегти %s: %s"
 
-#: ../camel/providers/imap/camel-imap-provider.c:64
-#: ../camel/providers/imap4/camel-imap4-provider.c:49
+#: ../camel/providers/imap/camel-imap-provider.c:48
+msgid "Ch_eck for new messages in subscribed folders"
+msgstr "П_еревіряти нову пошту у виписаних теках"
+
+#: ../camel/providers/imap/camel-imap-provider.c:66
+#: ../camel/providers/imap4/camel-imap4-provider.c:50
 msgid "Namespace:"
 msgstr "Простір назв:"
 
-#: ../camel/providers/imap/camel-imap-provider.c:68
-#: ../camel/providers/imap4/camel-imap4-provider.c:53
+#: ../camel/providers/imap/camel-imap-provider.c:70
+#: ../camel/providers/imap4/camel-imap4-provider.c:54
 msgid "_Apply filters to new messages in INBOX on this server"
 msgstr ""
 "Заст_осувати фільтри до нових повідомлень у теці \"Вхідні\" на цьому сервері"
 
-#: ../camel/providers/imap/camel-imap-provider.c:70
+#: ../camel/providers/imap/camel-imap-provider.c:72
 msgid "Check new messages for Jun_k contents"
 msgstr "Перевіряти, чи є нові повідомлення с_памом"
 
-#: ../camel/providers/imap/camel-imap-provider.c:74
-#: ../camel/providers/imap4/camel-imap4-provider.c:59
+#: ../camel/providers/imap/camel-imap-provider.c:76
+#: ../camel/providers/imap4/camel-imap4-provider.c:60
 msgid "Automatically synchroni_ze remote mail locally"
 msgstr "Автоматично син_хронізувати віддалену пошту локально"
 
-#: ../camel/providers/imap/camel-imap-provider.c:81
+#: ../camel/providers/imap/camel-imap-provider.c:83
 msgid "IMAP"
 msgstr "IMAP"
 
-#: ../camel/providers/imap/camel-imap-provider.c:83
+#: ../camel/providers/imap/camel-imap-provider.c:85
 msgid "For reading and storing mail on IMAP servers."
 msgstr "Зчитування та збереження пошти на серверах IMAP."
 
-#: ../camel/providers/imap/camel-imap-provider.c:100
+#: ../camel/providers/imap/camel-imap-provider.c:102
 #: ../camel/providers/imapp/camel-imapp-provider.c:69
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr "З'єднуватись з IMAP сервером використовуючи нешифрований пароль."
 
-#: ../camel/providers/imap/camel-imap-store.c:457
-#: ../camel/providers/imap4/camel-imap4-store.c:212
+#: ../camel/providers/imap/camel-imap-store.c:437
+#: ../camel/providers/imap4/camel-imap4-store.c:214
 #, c-format
 msgid "IMAP server %s"
 msgstr "Сервер IMAP %s"
 
-#: ../camel/providers/imap/camel-imap-store.c:459
-#: ../camel/providers/imap4/camel-imap4-store.c:214
+#: ../camel/providers/imap/camel-imap-store.c:439
+#: ../camel/providers/imap4/camel-imap4-store.c:216
 #, c-format
 msgid "IMAP service for %s on %s"
 msgstr "Служба IMAP для %s на %s"
 
-#: ../camel/providers/imap/camel-imap-store.c:587
-#: ../camel/providers/imap/camel-imap-store.c:602
-#: ../camel/providers/imap4/camel-imap4-store.c:249
-#: ../camel/providers/imap4/camel-imap4-store.c:264
+#: ../camel/providers/imap/camel-imap-store.c:568
+#: ../camel/providers/imap/camel-imap-store.c:583
+#: ../camel/providers/imap4/camel-imap4-store.c:251
+#: ../camel/providers/imap4/camel-imap4-store.c:266
 #: ../camel/providers/nntp/camel-nntp-store.c:183
 #: ../camel/providers/nntp/camel-nntp-store.c:198
-#: ../camel/providers/pop3/camel-pop3-store.c:173
-#: ../camel/providers/pop3/camel-pop3-store.c:187
-#: ../camel/providers/smtp/camel-smtp-transport.c:258
-#: ../camel/providers/smtp/camel-smtp-transport.c:273
+#: ../camel/providers/pop3/camel-pop3-store.c:171
+#: ../camel/providers/pop3/camel-pop3-store.c:185
+#: ../camel/providers/smtp/camel-smtp-transport.c:260
+#: ../camel/providers/smtp/camel-smtp-transport.c:275
 #, c-format
 msgid "Could not connect to %s: %s"
 msgstr "Не вдається з'єднатись з  %s: %s"
 
-#: ../camel/providers/imap/camel-imap-store.c:588
-#: ../camel/providers/imap4/camel-imap4-store.c:250
+#: ../camel/providers/imap/camel-imap-store.c:569
+#: ../camel/providers/imap4/camel-imap4-store.c:252
 #: ../camel/providers/nntp/camel-nntp-store.c:184
-#: ../camel/providers/pop3/camel-pop3-store.c:174
-#: ../camel/providers/smtp/camel-smtp-transport.c:259
+#: ../camel/providers/pop3/camel-pop3-store.c:172
+#: ../camel/providers/smtp/camel-smtp-transport.c:261
 msgid "SSL unavailable"
 msgstr "SSL недоступний"
 
-#: ../camel/providers/imap/camel-imap-store.c:599
-#: ../camel/providers/imap/camel-imap-store.c:881
+#: ../camel/providers/imap/camel-imap-store.c:580
+#: ../camel/providers/imap/camel-imap-store.c:862
 msgid "Connection cancelled"
 msgstr "З'єднання скасовано"
 
+#: ../camel/providers/imap/camel-imap-store.c:691
 #: ../camel/providers/imap/camel-imap-store.c:710
-#: ../camel/providers/imap/camel-imap-store.c:729
-#: ../camel/providers/imap/camel-imap-store.c:735
-#: ../camel/providers/imap/camel-imap-store.c:761
-#: ../camel/providers/imap4/camel-imap4-store.c:312
-#: ../camel/providers/imap4/camel-imap4-store.c:327
-#: ../camel/providers/imap4/camel-imap4-store.c:335
+#: ../camel/providers/imap/camel-imap-store.c:716
+#: ../camel/providers/imap/camel-imap-store.c:742
+#: ../camel/providers/imap4/camel-imap4-store.c:314
+#: ../camel/providers/imap4/camel-imap4-store.c:329
+#: ../camel/providers/imap4/camel-imap4-store.c:338
 #, c-format
 msgid "Failed to connect to IMAP server %s in secure mode: %s"
 msgstr "Не вдається під'єднатись до IMAP серверу %s в безпечному режимі: %s"
 
-#: ../camel/providers/imap/camel-imap-store.c:711
-#: ../camel/providers/smtp/camel-smtp-transport.c:331
+#: ../camel/providers/imap/camel-imap-store.c:692
+#: ../camel/providers/smtp/camel-smtp-transport.c:333
 msgid "STARTTLS not supported"
 msgstr "STARTTLS не підтримується"
 
-#: ../camel/providers/imap/camel-imap-store.c:730
+#: ../camel/providers/imap/camel-imap-store.c:711
 msgid "SSL negotiations failed"
 msgstr "Збій при встановленні сеансу SSL"
 
-#: ../camel/providers/imap/camel-imap-store.c:736
-#: ../camel/providers/imap4/camel-imap4-store.c:336
-#: ../camel/providers/smtp/camel-smtp-transport.c:370
+#: ../camel/providers/imap/camel-imap-store.c:717
+#: ../camel/providers/imap4/camel-imap4-store.c:339
+#: ../camel/providers/smtp/camel-smtp-transport.c:372
 msgid "SSL is not available in this build"
 msgstr "SSL не підтримується у цій збірці"
 
-#: ../camel/providers/imap/camel-imap-store.c:884
+#: ../camel/providers/imap/camel-imap-store.c:865
 #, c-format
 msgid "Could not connect with command \"%s\": %s"
 msgstr "Не вдається з'єднатись командою \"%s\": %s"
 
 #. create a dummy "." parent inbox, use to scan, then put back at the top level
-#: ../camel/providers/imap/camel-imap-store.c:1069
-#: ../camel/providers/imap/camel-imap-store.c:2452
-#: ../camel/providers/imap4/camel-imap4-store-summary.c:367
-#: ../camel/providers/imap4/camel-imap4-store.c:1326
+#: ../camel/providers/imap/camel-imap-store.c:1053
+#: ../camel/providers/imap/camel-imap-store.c:2400
+#: ../camel/providers/imap4/camel-imap4-store-summary.c:368
+#: ../camel/providers/imap4/camel-imap4-store.c:1408
 #: ../camel/providers/local/camel-maildir-folder.c:77
-#: ../camel/providers/local/camel-maildir-store.c:218
-#: ../camel/providers/local/camel-maildir-store.c:290
-#: ../camel/providers/local/camel-maildir-store.c:514
-#: ../camel/providers/local/camel-maildir-store.c:527
+#: ../camel/providers/local/camel-maildir-store.c:219
+#: ../camel/providers/local/camel-maildir-store.c:291
+#: ../camel/providers/local/camel-maildir-store.c:517
+#: ../camel/providers/local/camel-maildir-store.c:530
 #: ../camel/providers/local/camel-spool-store.c:464
 #: ../servers/exchange/storage/exchange-hierarchy-foreign.c:264
 msgid "Inbox"
 msgstr "Вхідні"
 
-#: ../camel/providers/imap/camel-imap-store.c:1071
+#: ../camel/providers/imap/camel-imap-store.c:1055
 #: ../servers/exchange/storage/exchange-hierarchy-foreign.c:263
 msgid "Drafts"
 msgstr "Чернетки"
 
-#: ../camel/providers/imap/camel-imap-store.c:1073
+#: ../camel/providers/imap/camel-imap-store.c:1057
 msgid "Sent"
 msgstr "Надіслані"
 
-#: ../camel/providers/imap/camel-imap-store.c:1075
+#: ../camel/providers/imap/camel-imap-store.c:1059
 msgid "Templates"
 msgstr "Шаблони"
 
-#: ../camel/providers/imap/camel-imap-store.c:1348
+#: ../camel/providers/imap/camel-imap-store.c:1304
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "Сервер IMAP %s не підтримує запитаний тип автентифікації %s"
 
-#: ../camel/providers/imap/camel-imap-store.c:1358
-#: ../camel/providers/smtp/camel-smtp-transport.c:504
+#: ../camel/providers/imap/camel-imap-store.c:1314
+#: ../camel/providers/smtp/camel-smtp-transport.c:507
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "Автентифікація типу %s не підтримується"
 
-#: ../camel/providers/imap/camel-imap-store.c:1430
+#: ../camel/providers/imap/camel-imap-store.c:1388
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -3209,34 +3306,34 @@
 "%s\n"
 "\n"
 
-#: ../camel/providers/imap/camel-imap-store.c:1924
-#: ../camel/providers/imap/camel-imap-store.c:2294
-#: ../camel/providers/imap4/camel-imap4-store.c:956
+#: ../camel/providers/imap/camel-imap-store.c:1861
+#: ../camel/providers/imap/camel-imap-store.c:2242
+#: ../camel/providers/imap4/camel-imap4-store.c:959
 #, c-format
 msgid ""
 "The folder name \"%s\" is invalid because it contains the character \"%c\""
 msgstr "Назва теки \"%s\" некоректна, тому що містить символ \"%c\""
 
-#: ../camel/providers/imap/camel-imap-store.c:2041
-#: ../camel/providers/local/camel-maildir-store.c:191
+#: ../camel/providers/imap/camel-imap-store.c:1978
+#: ../camel/providers/local/camel-maildir-store.c:192
 #: ../camel/providers/local/camel-mbox-store.c:204
 #: ../camel/providers/local/camel-mh-store.c:249
 #, c-format
-msgid "Cannot create folder `%s': folder exists."
-msgstr "Не вдається створити теку: %s: тека вже існує."
+msgid "Cannot create folder '%s': folder exists."
+msgstr "Не вдається створити теку «%s»: тека вже існує."
 
-#: ../camel/providers/imap/camel-imap-store.c:2305
+#: ../camel/providers/imap/camel-imap-store.c:2253
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Невідома батьківська тека: %s"
 
-#: ../camel/providers/imap4/camel-imap4-command.c:550
-#: ../camel/providers/imap4/camel-imap4-command.c:557
+#: ../camel/providers/imap4/camel-imap4-command.c:576
+#: ../camel/providers/imap4/camel-imap4-command.c:583
 #, c-format
 msgid "Failed sending command to IMAP server %s: %s"
 msgstr "Не вдається надіслати команду на IMAP сервер %s: %s"
 
-#: ../camel/providers/imap4/camel-imap4-command.c:660
+#: ../camel/providers/imap4/camel-imap4-command.c:686
 #, c-format
 msgid "Unexpected response from IMAP4 server %s: %s"
 msgstr "Неочікувана відповідь від сервера IMAP4 %s: %s"
@@ -3246,141 +3343,159 @@
 msgid "Unexpected greeting from IMAP server %s."
 msgstr "Неочікувана привітання від сервера IMAP %s."
 
-#: ../camel/providers/imap4/camel-imap4-engine.c:431
+#: ../camel/providers/imap4/camel-imap4-engine.c:450
 #, c-format
-msgid "Cannot select folder `%s': Invalid mailbox name"
-msgstr "Не вдається вибрати теку `%s': Недопустима назва теки"
+msgid "Cannot select folder '%s': Invalid mailbox name"
+msgstr "Не вдається вибрати теку «%s»: неприпустима назва поштової скриньки"
 
-#: ../camel/providers/imap4/camel-imap4-engine.c:437
+#: ../camel/providers/imap4/camel-imap4-engine.c:456
 #, c-format
-msgid "Cannot select folder `%s': Bad command"
-msgstr "Не вдається вибрати теку `%s': Неправильна команда"
+msgid "Cannot select folder '%s': Bad command"
+msgstr "Не вдається вибрати теку «%s»: неправильна команда"
 
-#: ../camel/providers/imap4/camel-imap4-engine.c:1547
-#: ../camel/providers/imap4/camel-imap4-engine.c:1586
-#: ../camel/providers/imap4/camel-imap4-engine.c:1631
-#: ../camel/providers/imap4/camel-imap4-engine.c:1687
+#: ../camel/providers/imap4/camel-imap4-engine.c:1433
+#, c-format
+msgid "Failed to send command to IMAP server %s: %s"
+msgstr "Помилка при надісланні команди на сервер IMAP %s: %s"
+
+#: ../camel/providers/imap4/camel-imap4-engine.c:1435
+msgid "service unavailable"
+msgstr "служба недоступна"
+
+#: ../camel/providers/imap4/camel-imap4-engine.c:1569
+#: ../camel/providers/imap4/camel-imap4-engine.c:1608
+#: ../camel/providers/imap4/camel-imap4-engine.c:1653
+#: ../camel/providers/imap4/camel-imap4-engine.c:1709
 #, c-format
 msgid "IMAP4 server %s unexpectedly disconnected: %s"
 msgstr "IMAP4 сервер %s несподівано розірвав з'єднання: %s"
 
 #: ../camel/providers/imap4/camel-imap4-folder.c:89
 msgid ""
-"Enable Mailing-List detection required for some filter and vFolder rules"
+"Enable extended Mailing-List detection required for some filter and vFolder "
+"rules"
 msgstr ""
-"Увімкнення визначення списків розсилки вимагається для деяких фільтрів та "
+"Увімкнути визначення списків розсилки, вимагається для деяких фільтрів та "
 "правил vFolder"
 
-#: ../camel/providers/imap4/camel-imap4-folder.c:402
+#: ../camel/providers/imap4/camel-imap4-folder.c:90
+msgid "Expire cached messages that haven't been read in X seconds"
+msgstr "Відкидати збережені повідомлення, які не були прочитані за X секунд"
+
+#: ../camel/providers/imap4/camel-imap4-folder.c:91
+msgid "Expire cached messages older than X seconds"
+msgstr "Відкидати повідомлення, що зберігаються більше X секунд"
+
+#: ../camel/providers/imap4/camel-imap4-folder.c:423
 #, c-format
-msgid "Cannot access folder `%s': %s"
-msgstr "Не вдається отримати доступ до теки: \"%s\": %s"
+msgid "Cannot access folder '%s': %s"
+msgstr "Не вдається отримати доступ до теки: «%s»: %s"
 
-#: ../camel/providers/imap4/camel-imap4-folder.c:461
+#: ../camel/providers/imap4/camel-imap4-folder.c:482
 #, c-format
-msgid "Cannot sync flags to folder `%s': Unknown"
-msgstr "Не вдається синхронізувати ознаки з текою `%s': Невідомо"
+msgid "Cannot sync flags to folder '%s': Unknown error"
+msgstr "Не вдається синхронізувати ознаки з текою «%s»: невідома помилка"
 
-#: ../camel/providers/imap4/camel-imap4-folder.c:467
+#: ../camel/providers/imap4/camel-imap4-folder.c:488
 #, c-format
-msgid "Cannot sync flags to folder `%s': Bad command"
-msgstr "Не вдається синхронізувати ознаки з текою `%s': Неправильна команда"
+msgid "Cannot sync flags to folder '%s': Bad command"
+msgstr "Не вдається синхронізувати ознаки з текою «%s»: неправильна команда"
 
-#: ../camel/providers/imap4/camel-imap4-folder.c:607
+#: ../camel/providers/imap4/camel-imap4-folder.c:628
 #, c-format
-msgid "Cannot expunge folder `%s': Unknown"
-msgstr "Не вдається очистити теку `%s': Невідомо"
+msgid "Cannot expunge folder '%s': Unknown error"
+msgstr "Не вдається очистити теку «%s»: невідома помилка"
 
-#: ../camel/providers/imap4/camel-imap4-folder.c:612
+#: ../camel/providers/imap4/camel-imap4-folder.c:633
 #, c-format
-msgid "Cannot expunge folder `%s': Bad command"
-msgstr "Не вдається очистити теку `%s': Неправильна команда"
+msgid "Cannot expunge folder '%s': Bad command"
+msgstr "Не вдається очистити теку «%s»: неправильна команда"
 
-#: ../camel/providers/imap4/camel-imap4-folder.c:868
+#: ../camel/providers/imap4/camel-imap4-folder.c:889
 #, c-format
-msgid "Cannot get message %s from folder `%s': No such message"
+msgid "Cannot get message %s from folder '%s': No such message"
 msgstr ""
-"Не вдається отримати повідомлення %s з теки \"%s\": Немає такого повідомлення"
+"Не вдається отримати повідомлення %s з теки «%s»: немає такого повідомлення"
 
-#: ../camel/providers/imap4/camel-imap4-folder.c:873
+#: ../camel/providers/imap4/camel-imap4-folder.c:894
 #, c-format
-msgid "Cannot get message %s from folder `%s': Bad command"
-msgstr ""
-"Не вдається отримати повідомлення \"%s\" з теки \"%s\": Неправильна команда"
+msgid "Cannot get message %s from folder '%s': Bad command"
+msgstr "Не вдається отримати повідомлення %s з теки «%s»: неправильна команда"
 
-#: ../camel/providers/imap4/camel-imap4-folder.c:917
+#: ../camel/providers/imap4/camel-imap4-folder.c:938
 #, c-format
-msgid "Cannot append message to folder `%s': Folder is read-only"
-msgstr "Не вдається додати повідомлення у теку: %s: Тека лише для читання"
+msgid "Cannot append message to folder '%s': Folder is read-only"
+msgstr "Не вдається додати повідомлення до теки «%s»: тека лише для читання"
 
-#: ../camel/providers/imap4/camel-imap4-folder.c:1010
+#: ../camel/providers/imap4/camel-imap4-folder.c:1031
 #, c-format
-msgid "Cannot append message to folder `%s': Unknown error"
-msgstr "Не вдається додати повідомлення у теку `%s': Невідома помилка"
+msgid "Cannot append message to folder '%s': Unknown error"
+msgstr "Не вдається додати повідомлення до теки «%s»: невідома помилка"
 
-#: ../camel/providers/imap4/camel-imap4-folder.c:1040
+#: ../camel/providers/imap4/camel-imap4-folder.c:1061
 #, c-format
-msgid "Cannot append message to folder `%s': Bad command"
-msgstr "Не вдається додати повідомлення до теки `%s': Неправильна команда"
+msgid "Cannot append message to folder '%s': Bad command"
+msgstr "Не вдається додати повідомлення до теки «%s»: неправильна команда"
 
-#: ../camel/providers/imap4/camel-imap4-folder.c:1160
+#: ../camel/providers/imap4/camel-imap4-folder.c:1181
 #, c-format
-msgid "Cannot move messages from folder `%s' to folder `%s': Unknown"
-msgstr "Не вдається перемістити повідомлення з теки `%s' у теку `%s': Невідомо"
+msgid "Cannot move messages from folder '%s' to folder '%s': Unknown error"
+msgstr ""
+"Не вдається перемістити повідомлення з теки «%s» до теки «%s»: невідома помилка"
 
-#: ../camel/providers/imap4/camel-imap4-folder.c:1164
+#: ../camel/providers/imap4/camel-imap4-folder.c:1185
 #, c-format
-msgid "Cannot copy messages from folder `%s' to folder `%s': Unknown"
+msgid "Cannot copy messages from folder '%s' to folder '%s': Unknown error"
 msgstr ""
-"Не вдається копіювати повідомлення з теки \"%s\" у теку \"%s\": Невідомо"
+"Не вдається скопіювати повідомлення з теки «%s» до теки «%s»: невідома помилка"
 
-#: ../camel/providers/imap4/camel-imap4-folder.c:1172
+#: ../camel/providers/imap4/camel-imap4-folder.c:1193
 #, c-format
-msgid "Cannot move messages from folder `%s' to folder `%s': Bad command"
+msgid "Cannot move messages from folder '%s' to folder '%s': Bad command"
 msgstr ""
-"Не вдається перемістити повідомлення з теки \"%s\" у теку \"%s\": "
-"Неправильна команда"
+"Не вдається перемістити повідомлення з теки «%s» до теки «%s»: неправильна "
+"команда"
 
-#: ../camel/providers/imap4/camel-imap4-folder.c:1176
+#: ../camel/providers/imap4/camel-imap4-folder.c:1197
 #, c-format
-msgid "Cannot copy messages from folder `%s' to folder `%s': Bad command"
+msgid "Cannot copy messages from folder '%s' to folder '%s': Bad command"
 msgstr ""
-"Не вдається копіювати повідомлення з теки \"%s\" у теку \"%s\": Неправильна "
+"Не вдається копіювати повідомлення з теки «%s» до теки «%s»: неправильна "
 "команда"
 
-#: ../camel/providers/imap4/camel-imap4-provider.c:55
+#: ../camel/providers/imap4/camel-imap4-provider.c:56
 msgid "Check new messages for _Junk contents"
 msgstr "Перевіряти, чи є нові повідомлення _спамом"
 
-#: ../camel/providers/imap4/camel-imap4-provider.c:57
+#: ../camel/providers/imap4/camel-imap4-provider.c:58
 msgid "Only check for Junk messa_ges in the INBOX folder"
 msgstr "Перевіряти, чи є нові повідомлення сп_амом у теці \"Вхідні\""
 
-#: ../camel/providers/imap4/camel-imap4-provider.c:66
+#: ../camel/providers/imap4/camel-imap4-provider.c:67
 msgid "IMAP4rev1"
 msgstr "IMAP4rev1"
 
-#: ../camel/providers/imap4/camel-imap4-provider.c:68
+#: ../camel/providers/imap4/camel-imap4-provider.c:69
 msgid "For reading and storing mail on IMAPv4rev1 servers."
 msgstr "Зчитування та збереження пошти на серверах IMAPv4rev1."
 
-#: ../camel/providers/imap4/camel-imap4-provider.c:85
+#: ../camel/providers/imap4/camel-imap4-provider.c:86
 msgid ""
 "This option will connect to the IMAPv4rev1 server using a plaintext password."
 msgstr ""
 "Цей параметр дозволяє з'єднуватись з сервером IMAP використовуючи "
 "нешифрований пароль."
 
-#: ../camel/providers/imap4/camel-imap4-store.c:261
+#: ../camel/providers/imap4/camel-imap4-store.c:263
 #: ../camel/providers/imapp/camel-imapp-store.c:249
 #: ../camel/providers/nntp/camel-nntp-store.c:195
 #: ../camel/providers/nntp/camel-nntp-store.c:214
-#: ../camel/providers/pop3/camel-pop3-store.c:184
-#: ../camel/providers/smtp/camel-smtp-transport.c:270
+#: ../camel/providers/pop3/camel-pop3-store.c:182
+#: ../camel/providers/smtp/camel-smtp-transport.c:272
 msgid "Connection canceled"
 msgstr "З'єднання скасовано"
 
-#: ../camel/providers/imap4/camel-imap4-store.c:298
+#: ../camel/providers/imap4/camel-imap4-store.c:300
 #, c-format
 msgid ""
 "Failed to connect to IMAP server %s in secure mode: Server does not support "
@@ -3389,12 +3504,12 @@
 "Не вдається під'єднатись до IMAP сервера %s у безпечному режимі: сервер не "
 "підтримує STARTTLS"
 
-#: ../camel/providers/imap4/camel-imap4-store.c:328
-#: ../camel/providers/pop3/camel-pop3-store.c:252
+#: ../camel/providers/imap4/camel-imap4-store.c:330
+#: ../camel/providers/pop3/camel-pop3-store.c:250
 msgid "TLS negotiations failed"
 msgstr "Помилка при встановленні сеансу TLS"
 
-#: ../camel/providers/imap4/camel-imap4-store.c:412
+#: ../camel/providers/imap4/camel-imap4-store.c:415
 #, c-format
 msgid ""
 "Cannot authenticate to IMAP server %s using the %s authentication mechanism"
@@ -3402,140 +3517,142 @@
 "Помилка автентифікації на IMAP сервері %s використовуючи %s механізм "
 "автентифікації"
 
-#: ../camel/providers/imap4/camel-imap4-store.c:535
+#: ../camel/providers/imap4/camel-imap4-store.c:538
 #, c-format
 msgid "Cannot authenticate to IMAP server %s using %s"
 msgstr "Не вдається пройти реєстрацію на IMAP сервері %s використовуючи %s"
 
-#: ../camel/providers/imap4/camel-imap4-store.c:698
-#: ../camel/providers/imap4/camel-imap4-store.c:966
+#: ../camel/providers/imap4/camel-imap4-store.c:701
+#: ../camel/providers/imap4/camel-imap4-store.c:969
 msgid "Cannot create IMAP folders in offline mode."
 msgstr "Не можна створювати теку IMAP у автономному режимі."
 
-#: ../camel/providers/imap4/camel-imap4-store.c:737
+#: ../camel/providers/imap4/camel-imap4-store.c:740
 #, c-format
-msgid "Cannot get folder `%s' on IMAP server %s: Unknown"
-msgstr "Не вдається отримати теку `%s' з IMAP сервера %s: Невідомо"
+msgid "Cannot get folder '%s' on IMAP server %s: Unknown error"
+msgstr "Не вдається отримати теку «%s» з сервера IMAP %s: невідома помилка"
 
-#: ../camel/providers/imap4/camel-imap4-store.c:818
+#: ../camel/providers/imap4/camel-imap4-store.c:821
 #, c-format
-msgid "Cannot get LIST information for `%s' on IMAP server %s: %s"
-msgstr "Не вдається отримати інформацію для `%s' на IMAP сервері %s: %s"
+msgid "Cannot get LIST information for '%s' on IMAP server %s: %s"
+msgstr "Не вдається отримати інформацію для «%s» на сервері IMAP %s: %s"
 
-#: ../camel/providers/imap4/camel-imap4-store.c:820
-#: ../camel/providers/imap4/camel-imap4-store.c:1495
+#: ../camel/providers/imap4/camel-imap4-store.c:823
+#: ../camel/providers/imap4/camel-imap4-store.c:1579
 msgid "Bad command"
 msgstr "Неправильна команда"
 
-#: ../camel/providers/imap4/camel-imap4-store.c:899
+#: ../camel/providers/imap4/camel-imap4-store.c:902
 #, c-format
-msgid "Cannot create folder `%s': Invalid mailbox name"
-msgstr "Не вдається створити теку \"%s\": Неправильна назва поштової скриньки"
+msgid "Cannot create folder '%s': Invalid mailbox name"
+msgstr "Не вдається створити теку «%s»: неправильна назва поштової скриньки"
 
-#: ../camel/providers/imap4/camel-imap4-store.c:904
+#: ../camel/providers/imap4/camel-imap4-store.c:907
 #, c-format
-msgid "Cannot create folder `%s': Bad command"
-msgstr "Не вдається створити теку \"%s\": Неправильна команда"
+msgid "Cannot create folder '%s': Bad command"
+msgstr "Не вдається створити теку «%s»: неправильна команда"
 
-#: ../camel/providers/imap4/camel-imap4-store.c:1010
+#: ../camel/providers/imap4/camel-imap4-store.c:1013
 #, c-format
-msgid "Cannot delete folder `%s': Special folder"
-msgstr "Не вдається видалити теку %s: Спеціальна тека"
+msgid "Cannot delete folder '%s': Special folder"
+msgstr "Не вдається видалити теку «%s»: спеціальна тека"
 
-#: ../camel/providers/imap4/camel-imap4-store.c:1017
+#: ../camel/providers/imap4/camel-imap4-store.c:1020
 msgid "Cannot delete IMAP folders in offline mode."
 msgstr "Не можна видаляти теку IMAP у автономному режимі."
 
-#: ../camel/providers/imap4/camel-imap4-store.c:1076
+#: ../camel/providers/imap4/camel-imap4-store.c:1079
 #, c-format
-msgid "Cannot delete folder `%s': Invalid mailbox name"
-msgstr "Не вдається видалити теку %s: Неправильна назва поштової скриньки"
+msgid "Cannot delete folder '%s': Invalid mailbox name"
+msgstr "Не вдається видалити теку «%s»: неправильна назва поштової скриньки"
 
-#: ../camel/providers/imap4/camel-imap4-store.c:1081
+#: ../camel/providers/imap4/camel-imap4-store.c:1084
 #, c-format
-msgid "Cannot delete folder `%s': Bad command"
-msgstr "Не вдається видалити теку %s: Неправильна команда"
+msgid "Cannot delete folder '%s': Bad command"
+msgstr "Не вдається видалити теку «%s»: неправильна команда"
 
-#: ../camel/providers/imap4/camel-imap4-store.c:1101
+#: ../camel/providers/imap4/camel-imap4-store.c:1104
 #, c-format
-msgid "Cannot rename folder `%s' to `%s': Special folder"
-msgstr "Не вдається перейменувати теку `%s' на `%s': Спеціальна тека"
+msgid "Cannot rename folder '%s' to '%s': Special folder"
+msgstr "Не вдається перейменувати теку «%s» на «%s»: спеціальна тека"
 
-#: ../camel/providers/imap4/camel-imap4-store.c:1108
+#: ../camel/providers/imap4/camel-imap4-store.c:1111
 msgid "Cannot rename IMAP folders in offline mode."
 msgstr "Не можна перейменовувати теку IMAP у автономному режимі."
 
-#: ../camel/providers/imap4/camel-imap4-store.c:1139
+#: ../camel/providers/imap4/camel-imap4-store.c:1142
 #, c-format
-msgid "Cannot rename folder `%s' to `%s': Invalid mailbox name"
+msgid "Cannot rename folder '%s' to '%s': Invalid mailbox name"
 msgstr ""
-"Не вдається перейменувати теку `%s' на `%s': Неправильна назва поштової "
+"Не вдається перейменувати теку «%s» на «%s»: неправильна назва поштової "
 "скриньки"
 
-#: ../camel/providers/imap4/camel-imap4-store.c:1144
+#: ../camel/providers/imap4/camel-imap4-store.c:1147
 #, c-format
-msgid "Cannot rename folder `%s' to `%s': Bad command"
-msgstr "Не вдається перейменувати теку `%s' на `%s': Неправильна команда"
+msgid "Cannot rename folder '%s' to '%s': Bad command"
+msgstr "Не вдається перейменувати теку «%s» на «%s»: неправильна команда"
 
-#: ../camel/providers/imap4/camel-imap4-store.c:1493
+#. Translators: the first %s is an IMAP4 command, either LSUB or LIST.
+#. * The fourth one is an error message.
+#: ../camel/providers/imap4/camel-imap4-store.c:1577
 #, c-format
-msgid "Cannot get %s information for pattern `%s' on IMAP server %s: %s"
+msgid "Cannot get %s information for pattern '%s' on IMAP server %s: %s"
 msgstr ""
-"Не вдається отримати %s інформацію про шаблон `%s' на IMAP сервері %s: %s"
+"Не вдається отримати інформацію %s про шаблон «%s» на сервері IMAP %s: %s"
 
-#: ../camel/providers/imap4/camel-imap4-store.c:1533
+#: ../camel/providers/imap4/camel-imap4-store.c:1638
 msgid "Cannot subscribe to IMAP folders in offline mode."
 msgstr "Не можна підписуватись на теку IMAP у автономному режимі."
 
-#: ../camel/providers/imap4/camel-imap4-store.c:1578
+#: ../camel/providers/imap4/camel-imap4-store.c:1683
 #, c-format
-msgid "Cannot subscribe to folder `%s': Invalid mailbox name"
+msgid "Cannot subscribe to folder '%s': Invalid mailbox name"
 msgstr ""
-"Не вдається підписатись на теку `%s': Неправильна назва поштової скриньки"
+"Не вдається підписатись на теку «%s»: неправильна назва поштової скриньки"
 
-#: ../camel/providers/imap4/camel-imap4-store.c:1583
+#: ../camel/providers/imap4/camel-imap4-store.c:1688
 #, c-format
-msgid "Cannot subscribe to folder `%s': Bad command"
-msgstr "Не вдається підписатись на теку `%s': Неправильна команда"
+msgid "Cannot subscribe to folder '%s': Bad command"
+msgstr "Не вдається підписатись на теку «%s»: неправильна команда"
 
-#: ../camel/providers/imap4/camel-imap4-store.c:1605
+#: ../camel/providers/imap4/camel-imap4-store.c:1710
 msgid "Cannot unsubscribe from IMAP folders in offline mode."
 msgstr "Не можна відписуватись від теки IMAP у автономному режимі."
 
-#: ../camel/providers/imap4/camel-imap4-store.c:1650
+#: ../camel/providers/imap4/camel-imap4-store.c:1755
 #, c-format
-msgid "Cannot unsubscribe from folder `%s': Invalid mailbox name"
+msgid "Cannot unsubscribe from folder '%s': Invalid mailbox name"
 msgstr ""
-"Не вдається відписатись від теки `%s': Неправильна назва поштової скриньки"
+"Не вдається відписатись від теки «%s»: неправильна назва поштової скриньки"
 
-#: ../camel/providers/imap4/camel-imap4-store.c:1655
+#: ../camel/providers/imap4/camel-imap4-store.c:1760
 #, c-format
-msgid "Cannot unsubscribe from folder `%s': Bad command"
-msgstr "Не вдається відписатись від теки `%s': Неправильна команда"
+msgid "Cannot unsubscribe from folder '%s': Bad command"
+msgstr "Не вдається відписатись від теки «%s»: неправильна команда"
 
-#: ../camel/providers/imap4/camel-imap4-summary.c:1451
+#: ../camel/providers/imap4/camel-imap4-summary.c:1596
 msgid "Scanning for changed messages"
 msgstr "Пошук змінених повідомлень."
 
-#: ../camel/providers/imap4/camel-imap4-summary.c:1472
+#: ../camel/providers/imap4/camel-imap4-summary.c:1617
 #, c-format
 msgid "IMAP server %s is in an inconsistent state."
 msgstr "Сервер IMAP %s знаходиться у неузгодженому стані."
 
-#: ../camel/providers/imap4/camel-imap4-summary.c:1499
+#: ../camel/providers/imap4/camel-imap4-summary.c:1644
 msgid "Fetching envelopes of new messages"
 msgstr "Отримання конвертів нових повідомлень"
 
-#: ../camel/providers/imap4/camel-imap4-utils.c:370
+#: ../camel/providers/imap4/camel-imap4-utils.c:437
 #, c-format
 msgid "Unexpected token in response from IMAP server %s: "
 msgstr "Неочікувана лексема у відповіді від сервера IMAP: %s"
 
-#: ../camel/providers/imap4/camel-imap4-utils.c:393
+#: ../camel/providers/imap4/camel-imap4-utils.c:460
 msgid "No data"
 msgstr "Немає даних"
 
-#: ../camel/providers/imap4/camel-imap4-utils.c:556
+#: ../camel/providers/imap4/camel-imap4-utils.c:623
 #, c-format
 msgid "IMAP server %s unexpectedly disconnected: %s"
 msgstr "IMAP сервер %s несподівано розірвав з'єднання: %s"
@@ -3572,32 +3689,32 @@
 msgid "Could not connect to POP server on %s"
 msgstr "Не вдається з'єднатись з сервером POP %s."
 
-#: ../camel/providers/local/camel-local-folder.c:174
+#: ../camel/providers/local/camel-local-folder.c:176
 msgid "Index message body data"
 msgstr "Індексувати дані вмісту повідомлення"
 
 #. $HOME relative path + protocol string
-#: ../camel/providers/local/camel-local-folder.c:382
+#: ../camel/providers/local/camel-local-folder.c:392
 #, c-format
 msgid "~%s (%s)"
 msgstr "~%s (%s)"
 
 #. /var/spool/mail relative path + protocol
-#: ../camel/providers/local/camel-local-folder.c:386
-#: ../camel/providers/local/camel-local-folder.c:389
+#: ../camel/providers/local/camel-local-folder.c:396
+#: ../camel/providers/local/camel-local-folder.c:399
 #, c-format
 msgid "mailbox:%s (%s)"
 msgstr "поштова скринька:%s (%s)"
 
 #. a full path + protocol
-#: ../camel/providers/local/camel-local-folder.c:393
+#: ../camel/providers/local/camel-local-folder.c:403
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
 #: ../camel/providers/local/camel-local-provider.c:48
-msgid "_Use the `.folders' folder summary file (exmh)"
-msgstr "_Використовувати файл зведення тек \".folders\" (exmh)"
+msgid "_Use the '.folders' folder summary file (exmh)"
+msgstr "_Використовувати спільний файл індексу «.folders» (exmh)"
 
 #: ../camel/providers/local/camel-local-provider.c:55
 msgid "MH-format mail directories"
@@ -3654,71 +3771,58 @@
 msgid "Standard Unix mbox spool directory"
 msgstr "Стандартний для Unix каталог пошти"
 
-#: ../camel/providers/local/camel-local-store.c:159
-#: ../camel/providers/local/camel-local-store.c:270
+#: ../camel/providers/local/camel-local-store.c:165
+#: ../camel/providers/local/camel-local-store.c:276
 #: ../camel/providers/local/camel-mbox-store.c:359
 #: ../camel/providers/local/camel-spool-store.c:129
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr "Корінь сховища %s не є абсолютним шляхом"
 
-#: ../camel/providers/local/camel-local-store.c:166
+#: ../camel/providers/local/camel-local-store.c:172
 #, c-format
 msgid "Store root %s is not a regular directory"
 msgstr "Сховище %s не є каталогом"
 
-#: ../camel/providers/local/camel-local-store.c:175
-#: ../camel/providers/local/camel-local-store.c:183
-#: ../camel/providers/local/camel-local-store.c:281
+#: ../camel/providers/local/camel-local-store.c:181
+#: ../camel/providers/local/camel-local-store.c:189
+#: ../camel/providers/local/camel-local-store.c:287
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "Не вдається отримати теку: %s: %s"
 
-#: ../camel/providers/local/camel-local-store.c:195
+#: ../camel/providers/local/camel-local-store.c:201
 msgid "Local stores do not have an inbox"
 msgstr "Локальне сховище не містить теку \"Вхідні\""
 
-#: ../camel/providers/local/camel-local-store.c:241
+#: ../camel/providers/local/camel-local-store.c:247
 #, c-format
 msgid "Local mail file %s"
 msgstr "Файл локальної пошти %s"
 
-#: ../camel/providers/local/camel-local-store.c:359
+#: ../camel/providers/local/camel-local-store.c:342
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr "Не вдається перейменувати теку \"%s\" на \"%s\": %s"
 
-#: ../camel/providers/local/camel-local-store.c:427
+#: ../camel/providers/local/camel-local-store.c:410
 #, c-format
 msgid "Could not rename '%s': %s"
 msgstr "Не вдається перейменувати теку \"%s\": %s"
 
-#: ../camel/providers/local/camel-local-store.c:452
-#: ../camel/providers/local/camel-local-store.c:462
-#: ../camel/providers/local/camel-mbox-store.c:276
-#: ../camel/providers/local/camel-mbox-store.c:288
-#, c-format
-msgid "Could not delete folder summary file `%s': %s"
-msgstr "Не вдається видалити файл зведення теки \"%s\": %s"
-
-#: ../camel/providers/local/camel-local-store.c:472
+#: ../camel/providers/local/camel-local-store.c:435
 #: ../camel/providers/local/camel-mbox-store.c:300
 #, c-format
-msgid "Could not delete folder index file `%s': %s"
-msgstr "Не вдається видалити індексний файл теки \"%s\": %s"
+msgid "Could not delete folder index file '%s': %s"
+msgstr "Не вдається видалити індексний файл теки «%s»: %s"
 
-#: ../camel/providers/local/camel-local-store.c:495
+#: ../camel/providers/local/camel-local-store.c:458
 #: ../camel/providers/local/camel-mbox-store.c:324
 #, c-format
-msgid "Could not delete folder meta file `%s': %s"
-msgstr "Не вдається видалити метафайл теки \"%s\": %s"
-
-#: ../camel/providers/local/camel-local-summary.c:409
-#, c-format
-msgid "Could not save summary: %s: %s"
-msgstr "Не вдається зберегти зведення %s: %s"
+msgid "Could not delete folder meta file '%s': %s"
+msgstr "Не вдається видалити метафайл теки «%s»: %s"
 
-#: ../camel/providers/local/camel-local-summary.c:467
+#: ../camel/providers/local/camel-local-summary.c:507
 msgid "Unable to add message to summary: unknown reason"
 msgstr "Не вдається додати повідомлення до зведення: причина невідома"
 
@@ -3753,70 +3857,70 @@
 msgid "Invalid message contents"
 msgstr "Неправильний вміст повідомлення"
 
-#: ../camel/providers/local/camel-maildir-store.c:147
-#: ../camel/providers/local/camel-maildir-store.c:172
+#: ../camel/providers/local/camel-maildir-store.c:148
+#: ../camel/providers/local/camel-maildir-store.c:173
 #: ../camel/providers/local/camel-mbox-store.c:176
 #: ../camel/providers/local/camel-mbox-store.c:188
 #, c-format
-msgid "Cannot create folder `%s': %s"
-msgstr "Не вдається створити теку \"%s\": %s"
+msgid "Cannot create folder '%s': %s"
+msgstr "Не вдається створити теку «%s»: %s"
 
-#: ../camel/providers/local/camel-maildir-store.c:160
+#: ../camel/providers/local/camel-maildir-store.c:161
 #: ../camel/providers/local/camel-mbox-store.c:147
 #: ../camel/providers/local/camel-mh-store.c:217
 #, c-format
-msgid "Cannot get folder `%s': %s"
-msgstr "Не вдається отримати теку: \"%s\": %s"
+msgid "Cannot get folder '%s': %s"
+msgstr "Не вдається отримати теку «%s»: %s"
 
-#: ../camel/providers/local/camel-maildir-store.c:164
+#: ../camel/providers/local/camel-maildir-store.c:165
 #: ../camel/providers/local/camel-mbox-store.c:155
 #: ../camel/providers/local/camel-mh-store.c:224
 #, c-format
-msgid "Cannot get folder `%s': folder does not exist."
-msgstr "Не вдається отримати теку: \"%s\": тека не існує."
+msgid "Cannot get folder '%s': folder does not exist."
+msgstr "Не вдається отримати теку «%s»: тека не існує."
 
-#: ../camel/providers/local/camel-maildir-store.c:188
+#: ../camel/providers/local/camel-maildir-store.c:189
 #, c-format
-msgid "Cannot get folder `%s': not a maildir directory."
-msgstr "Не вдається отримати теку \"%s\": не є каталогом Maildir."
+msgid "Cannot get folder '%s': not a maildir directory."
+msgstr "Не вдається отримати теку «%s»: не є каталогом Maildir."
 
-#: ../camel/providers/local/camel-maildir-store.c:233
-#: ../camel/providers/local/camel-maildir-store.c:271
+#: ../camel/providers/local/camel-maildir-store.c:234
+#: ../camel/providers/local/camel-maildir-store.c:272
 #: ../camel/providers/local/camel-mh-store.c:273
 #, c-format
-msgid "Could not delete folder `%s': %s"
-msgstr "Не вдається видалити теку \"%s\": %s"
+msgid "Could not delete folder '%s': %s"
+msgstr "Не вдається видалити теку «%s»: %s"
 
-#: ../camel/providers/local/camel-maildir-store.c:235
+#: ../camel/providers/local/camel-maildir-store.c:236
 msgid "not a maildir directory"
 msgstr "не є каталогом Maildir"
 
-#: ../camel/providers/local/camel-maildir-store.c:439
+#: ../camel/providers/local/camel-maildir-store.c:440
 #: ../camel/providers/local/camel-spool-store.c:331
 #: ../camel/providers/local/camel-spool-store.c:345
 #, c-format
-msgid "Could not scan folder `%s': %s"
-msgstr "Не вдається просканувати теку \"%s\": %s"
+msgid "Could not scan folder '%s': %s"
+msgstr "Не вдається просканувати теку «%s»: %s"
 
-#: ../camel/providers/local/camel-maildir-summary.c:433
-#: ../camel/providers/local/camel-maildir-summary.c:567
+#: ../camel/providers/local/camel-maildir-summary.c:439
+#: ../camel/providers/local/camel-maildir-summary.c:558
 #, c-format
 msgid "Cannot open maildir directory path: %s: %s"
 msgstr "Не вдається відкрити шлях до теки поштового каталогу: %s: %s"
 
-#: ../camel/providers/local/camel-maildir-summary.c:560
+#: ../camel/providers/local/camel-maildir-summary.c:551
 msgid "Checking folder consistency"
 msgstr "Перевірити узгодженість тек"
 
-#: ../camel/providers/local/camel-maildir-summary.c:664
+#: ../camel/providers/local/camel-maildir-summary.c:655
 msgid "Checking for new messages"
 msgstr "Перевірка нових повідомлень"
 
-#: ../camel/providers/local/camel-maildir-summary.c:755
-#: ../camel/providers/local/camel-mbox-summary.c:436
-#: ../camel/providers/local/camel-mbox-summary.c:609
-#: ../camel/providers/local/camel-mbox-summary.c:706
-#: ../camel/providers/local/camel-spool-summary.c:140
+#: ../camel/providers/local/camel-maildir-summary.c:741
+#: ../camel/providers/local/camel-mbox-summary.c:551
+#: ../camel/providers/local/camel-mbox-summary.c:733
+#: ../camel/providers/local/camel-mbox-summary.c:853
+#: ../camel/providers/local/camel-spool-summary.c:171
 msgid "Storing folder"
 msgstr "Збереження теки"
 
@@ -3856,34 +3960,40 @@
 
 #: ../camel/providers/local/camel-mbox-store.c:198
 #, c-format
-msgid "Cannot get folder `%s': not a regular file."
-msgstr "Не вдається отримати теку %s: не є звичайним файлом"
+msgid "Cannot get folder '%s': not a regular file."
+msgstr "Не вдається отримати теку «%s»: не є звичайним файлом"
 
 #: ../camel/providers/local/camel-mbox-store.c:228
 #: ../camel/providers/local/camel-mbox-store.c:239
 #: ../camel/providers/local/camel-mbox-store.c:262
 #, c-format
 msgid ""
-"Could not delete folder `%s':\n"
+"Could not delete folder '%s':\n"
 "%s"
 msgstr ""
-"Не вдається видалити теку \"%s\":\n"
+"Не вдається видалити теку «%s»:\n"
 "%s"
 
 #: ../camel/providers/local/camel-mbox-store.c:247
 #, c-format
-msgid "`%s' is not a regular file."
-msgstr "\"%s\" не є звичайним файлом."
+msgid "'%s' is not a regular file."
+msgstr "«%s» не є звичайним файлом."
 
 #: ../camel/providers/local/camel-mbox-store.c:254
 #, c-format
-msgid "Folder `%s' is not empty. Not deleted."
-msgstr "Тека \"%s\" не порожня. Не видалена."
+msgid "Folder '%s' is not empty. Not deleted."
+msgstr "Тека «%s» не порожня. Не видалено."
+
+#: ../camel/providers/local/camel-mbox-store.c:276
+#: ../camel/providers/local/camel-mbox-store.c:288
+#, c-format
+msgid "Could not delete folder summary file '%s': %s"
+msgstr "Не вдається видалити файл зведення теки «%s»: %s"
 
 #: ../camel/providers/local/camel-mbox-store.c:378
 #, c-format
-msgid "Cannot create directory `%s': %s."
-msgstr "Не вдається створити каталог \"%s\": %s"
+msgid "Cannot create directory '%s': %s."
+msgstr "Не вдається створити каталог «%s»: %s"
 
 #: ../camel/providers/local/camel-mbox-store.c:392
 #, c-format
@@ -3900,89 +4010,84 @@
 
 #: ../camel/providers/local/camel-mbox-store.c:498
 #, c-format
-msgid "Could not rename `%s': `%s': %s"
-msgstr "Не вдається перейменувати теку `%s': `%s': %s"
+msgid "Could not rename '%s': '%s': %s"
+msgstr "Не вдається перейменувати «%s»: «%s»: %s"
 
 #: ../camel/providers/local/camel-mbox-store.c:579
 #, c-format
 msgid "Could not rename '%s' to %s: %s"
-msgstr "Не вдається перейменувати \"%s\": у %s: %s"
+msgstr "Не вдається перейменувати «%s»: у %s: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:442
+#: ../camel/providers/local/camel-mbox-summary.c:557
 #, c-format
 msgid "Could not open folder: %s: %s"
 msgstr "Не вдається відкрити теку %s: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:490
+#: ../camel/providers/local/camel-mbox-summary.c:607
 #, c-format
 msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr "Фатальна помилка поштового аналізатора поблизу позиції %ld в теці %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:546
+#: ../camel/providers/local/camel-mbox-summary.c:670
 #, c-format
 msgid "Cannot check folder: %s: %s"
 msgstr "Не вдається перевірити теку: %s: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:614
-#: ../camel/providers/local/camel-mbox-summary.c:711
-#: ../camel/providers/local/camel-spool-summary.c:145
+#: ../camel/providers/local/camel-mbox-summary.c:738
+#: ../camel/providers/local/camel-mbox-summary.c:858
+#: ../camel/providers/local/camel-spool-summary.c:176
 #, c-format
 msgid "Could not open file: %s: %s"
 msgstr "Не вдається відкрити файл %s: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:626
-#: ../camel/providers/local/camel-spool-summary.c:158
+#: ../camel/providers/local/camel-mbox-summary.c:750
+#: ../camel/providers/local/camel-spool-summary.c:189
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "Не вдається відкрити тимчасову поштову скриньку: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:639
-#: ../camel/providers/local/camel-mbox-summary.c:859
+#: ../camel/providers/local/camel-mbox-summary.c:763
+#: ../camel/providers/local/camel-mbox-summary.c:967
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "Не вдається закрити вихідну теку %s: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:648
+#: ../camel/providers/local/camel-mbox-summary.c:772
 #, c-format
 msgid "Could not close temporary folder: %s"
 msgstr "Не вдається закрити тимчасову теку: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:663
+#: ../camel/providers/local/camel-mbox-summary.c:787
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "Не вдається перейменувати теку: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:722
-#: ../camel/providers/local/camel-mbox-summary.c:1046
+#: ../camel/providers/local/camel-mbox-summary.c:869
+#: ../camel/providers/local/camel-mbox-summary.c:1097
 #, c-format
 msgid "Could not store folder: %s"
 msgstr "Не вдається зберегти теку: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:770
-#: ../camel/providers/local/camel-mbox-summary.c:799
-#: ../camel/providers/local/camel-mbox-summary.c:1088
-#: ../camel/providers/local/camel-mbox-summary.c:1117
-msgid "Detected a corrupt mbox file or an invalid 'From' header"
-msgstr "Пошкоджений файл поштової скриньки або неправильний заголовок 'Від'"
+#: ../camel/providers/local/camel-mbox-summary.c:908
+#: ../camel/providers/local/camel-mbox-summary.c:916
+#: ../camel/providers/local/camel-mbox-summary.c:1127
+#: ../camel/providers/local/camel-mbox-summary.c:1135
+msgid "Summary and folder mismatch, even after a sync"
+msgstr "Зведення та тека відрізняються навіть після синхронізації"
 
-#: ../camel/providers/local/camel-mbox-summary.c:935
-#: ../camel/providers/local/camel-spool-summary.c:326
+#: ../camel/providers/local/camel-mbox-summary.c:1060
+#: ../camel/providers/local/camel-spool-summary.c:357
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Невідома помилка: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:971
-#, c-format
-msgid "Folder %s cannot be opened: %s"
-msgstr "Не вдається відкрити теку\"%s\": %s"
-
-#: ../camel/providers/local/camel-mbox-summary.c:1182
-#: ../camel/providers/local/camel-mbox-summary.c:1208
+#: ../camel/providers/local/camel-mbox-summary.c:1203
+#: ../camel/providers/local/camel-mbox-summary.c:1229
 #, c-format
 msgid "Writing to temporary mailbox failed: %s"
 msgstr "Помилка запису в тимчасову поштову скриньку: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:1199
+#: ../camel/providers/local/camel-mbox-summary.c:1220
 #, c-format
 msgid "Writing to temporary mailbox failed: %s: %s"
 msgstr "Помилка запису в тимчасову поштову скриньку: %s: %s"
@@ -3998,61 +4103,61 @@
 
 #: ../camel/providers/local/camel-mh-store.c:232
 #, c-format
-msgid "Could not create folder `%s': %s"
-msgstr "Не вдається створити теку \"%s\":%s"
+msgid "Could not create folder '%s': %s"
+msgstr "Не вдається створити теку «%s»:%s"
 
 #: ../camel/providers/local/camel-mh-store.c:244
 #, c-format
-msgid "Cannot get folder `%s': not a directory."
-msgstr "Не вдається отримати теку `%s': не є каталогом."
+msgid "Cannot get folder '%s': not a directory."
+msgstr "Не вдається отримати теку «%s»: не є каталогом."
 
-#: ../camel/providers/local/camel-mh-summary.c:246
+#: ../camel/providers/local/camel-mh-summary.c:264
 #, c-format
 msgid "Cannot open MH directory path: %s: %s"
 msgstr "Не вдається відкрити каталог MH: %s: %s"
 
 #: ../camel/providers/local/camel-spool-store.c:135
 #, c-format
-msgid "Spool `%s' cannot be opened: %s"
-msgstr "Не вдається відкрити сховище \"%s\": %s"
+msgid "Spool '%s' cannot be opened: %s"
+msgstr "Не вдається відкрити сховище «%s»: %s"
 
 #: ../camel/providers/local/camel-spool-store.c:147
 #, c-format
-msgid "Spool `%s' is not a regular file or directory"
-msgstr "Сховище \"%s\" не є регулярним файлом або каталогом"
+msgid "Spool '%s' is not a regular file or directory"
+msgstr "Сховище «%s» не є звичайним файлом або каталогом"
 
 #: ../camel/providers/local/camel-spool-store.c:166
 #, c-format
-msgid "Folder `%s/%s' does not exist."
-msgstr "Теки \"%s/%s\" не існує."
+msgid "Folder '%s/%s' does not exist."
+msgstr "Теки «%s/%s» не існує."
 
 #: ../camel/providers/local/camel-spool-store.c:176
 #, c-format
 msgid ""
-"Could not open folder `%s':\n"
+"Could not open folder '%s':\n"
 "%s"
 msgstr ""
-"Не вдається відкрити теку \"%s\":\n"
+"Не вдається відкрити теку «%s»:\n"
 "%s"
 
 #: ../camel/providers/local/camel-spool-store.c:180
 #, c-format
-msgid "Folder `%s' does not exist."
-msgstr "Тека \"%s\" не існує."
+msgid "Folder '%s' does not exist."
+msgstr "Тека «%s» не існує."
 
 #: ../camel/providers/local/camel-spool-store.c:185
 #, c-format
 msgid ""
-"Could not create folder `%s':\n"
+"Could not create folder '%s':\n"
 "%s"
 msgstr ""
-"Не вдається створити теку \"%s\":\n"
+"Не вдається створити теку «%s»:\n"
 "%s"
 
 #: ../camel/providers/local/camel-spool-store.c:193
 #, c-format
-msgid "`%s' is not a mailbox file."
-msgstr "\"%s\" не є файлом поштової скриньки."
+msgid "'%s' is not a mailbox file."
+msgstr "«%s» не є файлом поштової скриньки."
 
 #: ../camel/providers/local/camel-spool-store.c:210
 msgid "Store does not support an INBOX"
@@ -4076,28 +4181,28 @@
 msgid "Spool folders cannot be deleted"
 msgstr "Накопичувальні теки не можна видаляти"
 
-#: ../camel/providers/local/camel-spool-summary.c:171
-#: ../camel/providers/local/camel-spool-summary.c:181
-#: ../camel/providers/local/camel-spool-summary.c:191
+#: ../camel/providers/local/camel-spool-summary.c:202
+#: ../camel/providers/local/camel-spool-summary.c:212
+#: ../camel/providers/local/camel-spool-summary.c:222
 #, c-format
 msgid "Could not sync temporary folder %s: %s"
 msgstr "Не вдається синхронізувати тимчасову теку %s: %s"
 
-#: ../camel/providers/local/camel-spool-summary.c:207
+#: ../camel/providers/local/camel-spool-summary.c:238
 #, c-format
 msgid "Could not sync spool folder %s: %s"
 msgstr "Не вдається синхронізувати накопичувальну теку %s: %s"
 
-#: ../camel/providers/local/camel-spool-summary.c:238
-#: ../camel/providers/local/camel-spool-summary.c:255
-#: ../camel/providers/local/camel-spool-summary.c:266
+#: ../camel/providers/local/camel-spool-summary.c:269
+#: ../camel/providers/local/camel-spool-summary.c:286
+#: ../camel/providers/local/camel-spool-summary.c:297
 #, c-format
 msgid ""
 "Could not sync spool folder %s: %s\n"
-"Folder may be corrupt, copy saved in `%s'"
+"Folder may be corrupt, copy saved in '%s'"
 msgstr ""
 "Не вдається синхронізувати буферну теку %s: %s\n"
-"Можливо тека пошкоджена, копію збережено у `%s'"
+"Можливо тека пошкоджена, копію збережено у «%s»"
 
 #: ../camel/providers/nntp/camel-nntp-folder.c:176
 #: ../camel/providers/nntp/camel-nntp-folder.c:208
@@ -4105,19 +4210,19 @@
 msgid "Internal error: UID in invalid format: %s"
 msgstr "Внутрішня помилка: UID у неправильному форматі: %s"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:328
-#: ../camel/providers/nntp/camel-nntp-folder.c:331
-#: ../camel/providers/nntp/camel-nntp-folder.c:373
-#: ../camel/providers/nntp/camel-nntp-folder.c:375
+#: ../camel/providers/nntp/camel-nntp-folder.c:349
+#: ../camel/providers/nntp/camel-nntp-folder.c:352
+#: ../camel/providers/nntp/camel-nntp-folder.c:394
+#: ../camel/providers/nntp/camel-nntp-folder.c:396
 #, c-format
 msgid "Posting failed: %s"
 msgstr "Помилка при надсиланні: %s"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:393
+#: ../camel/providers/nntp/camel-nntp-folder.c:414
 msgid "You cannot post NNTP messages while working offline!"
 msgstr "Ви не можете надсилати повідомлення при автономній роботі!"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:404
+#: ../camel/providers/nntp/camel-nntp-folder.c:425
 msgid "You cannot copy messages from a NNTP folder!"
 msgstr "Ви не можете надсилати повідомлення з теки NNTP!"
 
@@ -4215,75 +4320,75 @@
 msgid "Cannot authenticate to server: %s"
 msgstr "Не вдається пройти реєстрацію на сервері: %s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1283
+#: ../camel/providers/nntp/camel-nntp-store.c:1289
 #, c-format
 msgid "NNTP Command failed: %s"
 msgstr "Збій команди NNTP: %s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1337
+#: ../camel/providers/nntp/camel-nntp-store.c:1343
 msgid "Not connected."
 msgstr "Немає з'єднання."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1390
+#: ../camel/providers/nntp/camel-nntp-store.c:1396
 #, c-format
 msgid "No such folder: %s"
 msgstr "Немає такої теки: %s"
 
-#: ../camel/providers/nntp/camel-nntp-summary.c:222
-#: ../camel/providers/nntp/camel-nntp-summary.c:318
+#: ../camel/providers/nntp/camel-nntp-summary.c:274
+#: ../camel/providers/nntp/camel-nntp-summary.c:370
 #, c-format
 msgid "%s: Scanning new messages"
 msgstr "%s: пошук нових повідомлень"
 
-#: ../camel/providers/nntp/camel-nntp-summary.c:229
+#: ../camel/providers/nntp/camel-nntp-summary.c:281
 #, c-format
 msgid "Unexpected server response from xover: %s"
 msgstr "Неочікувана відповідь сервера від xover: %s"
 
-#: ../camel/providers/nntp/camel-nntp-summary.c:332
+#: ../camel/providers/nntp/camel-nntp-summary.c:384
 #, c-format
 msgid "Unexpected server response from head: %s"
 msgstr "Неочікувана відповідь сервера від head: %s"
 
-#: ../camel/providers/nntp/camel-nntp-summary.c:372
+#: ../camel/providers/nntp/camel-nntp-summary.c:424
 msgid "Use cancel"
 msgstr "Використання скасовано"
 
-#: ../camel/providers/nntp/camel-nntp-summary.c:374
+#: ../camel/providers/nntp/camel-nntp-summary.c:426
 #, c-format
 msgid "Operation failed: %s"
 msgstr "Збій операції: %s"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:247
+#: ../camel/providers/pop3/camel-pop3-folder.c:251
 msgid "Retrieving POP summary"
 msgstr "Отримання POP-зведення"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:265
+#: ../camel/providers/pop3/camel-pop3-folder.c:269
 #, c-format
 msgid "Cannot get POP summary: %s"
 msgstr "Не вдається отримати зведення POP: %s"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:308
+#: ../camel/providers/pop3/camel-pop3-folder.c:312
 msgid "Expunging old messages"
 msgstr "Очищення старих повідомлень"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:316
+#: ../camel/providers/pop3/camel-pop3-folder.c:320
 msgid "Expunging deleted messages"
 msgstr "Очищення повідомлень, що позначені видаленими"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:492
+#: ../camel/providers/pop3/camel-pop3-folder.c:533
 #, c-format
 msgid "No message with UID %s"
 msgstr "Немає повідомлення з UID %s"
 
 #. Sigh, most of the crap in this function is so that the cancel button
 #. returns the proper exception code.  Sigh.
-#: ../camel/providers/pop3/camel-pop3-folder.c:499
+#: ../camel/providers/pop3/camel-pop3-folder.c:540
 #, c-format
 msgid "Retrieving POP message %d"
 msgstr "Отримання повідомлення POP %d"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:589
+#: ../camel/providers/pop3/camel-pop3-folder.c:630
 msgid "Unknown reason"
 msgstr "Невідома причина"
 
@@ -4326,34 +4431,34 @@
 "зашифрованого згідно протоколу APOP. Це може спрацьовувати не для всіх "
 "користувачів, навіть якщо сервер нібито його підтримує."
 
-#: ../camel/providers/pop3/camel-pop3-store.c:210
+#: ../camel/providers/pop3/camel-pop3-store.c:208
 #, c-format
 msgid "Failed to read a valid greeting from POP server %s"
 msgstr "Не вдається отримати привітання від POP сервера %s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:227
-#: ../camel/providers/pop3/camel-pop3-store.c:241
-#: ../camel/providers/pop3/camel-pop3-store.c:251
-#: ../camel/providers/pop3/camel-pop3-store.c:257
+#: ../camel/providers/pop3/camel-pop3-store.c:225
+#: ../camel/providers/pop3/camel-pop3-store.c:239
+#: ../camel/providers/pop3/camel-pop3-store.c:249
+#: ../camel/providers/pop3/camel-pop3-store.c:255
 #, c-format
 msgid "Failed to connect to POP server %s in secure mode: %s"
 msgstr "Не вдається під'єднатися до POP серверу %s у захищеному режимі: %s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:228
+#: ../camel/providers/pop3/camel-pop3-store.c:226
 msgid "STLS not supported by server"
 msgstr "STLS не підтримується сервером"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:258
+#: ../camel/providers/pop3/camel-pop3-store.c:256
 msgid "TLS is not available in this build"
 msgstr "TLS не підтримується у цій збірці"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:364
+#: ../camel/providers/pop3/camel-pop3-store.c:362
 #, c-format
 msgid "Could not connect to POP server %s"
 msgstr "Не вдається з'єднатись з POP сервером %s."
 
-#: ../camel/providers/pop3/camel-pop3-store.c:405
-#: ../camel/providers/pop3/camel-pop3-store.c:542
+#: ../camel/providers/pop3/camel-pop3-store.c:403
+#: ../camel/providers/pop3/camel-pop3-store.c:536
 #, c-format
 msgid ""
 "Unable to connect to POP server %s: No support for requested authentication "
@@ -4362,22 +4467,22 @@
 "Не вдається під'єднатись до POP серверу %s: Відсутня підтримка потрібного "
 "механізму автентифікації."
 
-#: ../camel/providers/pop3/camel-pop3-store.c:421
+#: ../camel/providers/pop3/camel-pop3-store.c:419
 #, c-format
-msgid "SASL `%s' Login failed for POP server %s: %s"
-msgstr "Не вдається під'єднатись через SASL \"%s\" до POP серверу %s: %s"
+msgid "SASL '%s' Login failed for POP server %s: %s"
+msgstr "Не вдається під'єднатись через SASL «%s» до POP серверу %s: %s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:433
+#: ../camel/providers/pop3/camel-pop3-store.c:431
 #, c-format
 msgid "Cannot login to POP server %s: SASL Protocol error"
 msgstr "Не вдається під'єднатись до POP серверу %s: помилка протоколу SASL"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:452
+#: ../camel/providers/pop3/camel-pop3-store.c:450
 #, c-format
 msgid "Failed to authenticate on POP server %s: %s"
 msgstr "Не вдається пройти реєстрацію на POP сервері %s: %s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:512
+#: ../camel/providers/pop3/camel-pop3-store.c:509
 #, c-format
 msgid ""
 "Unable to connect to POP server %s:\tInvalid APOP ID received. Impersonation "
@@ -4386,8 +4491,8 @@
 "Не вдається з'єднатися з сервером POP %s:\tОримано неправильний APOP ID. "
 "Схоже на атаку з виданням себе за іншого. Зв'яжіться з вашим адміністратором."
 
-#: ../camel/providers/pop3/camel-pop3-store.c:556
-#: ../camel/providers/pop3/camel-pop3-store.c:569
+#: ../camel/providers/pop3/camel-pop3-store.c:550
+#: ../camel/providers/pop3/camel-pop3-store.c:563
 #, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
@@ -4396,7 +4501,7 @@
 "Не вдається з'єднатись з сервером POP %s.\n"
 "Помилка відсилання пароля: %s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:563
+#: ../camel/providers/pop3/camel-pop3-store.c:557
 #, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
@@ -4405,10 +4510,10 @@
 "Не вдається з'єднатись з сервером POP %s.\n"
 "Помилка відсилання назви рахунку: %s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:669
+#: ../camel/providers/pop3/camel-pop3-store.c:667
 #, c-format
-msgid "No such folder `%s'."
-msgstr "Тека\"%s\" не існує."
+msgid "No such folder '%s'."
+msgstr "Тека «%s» не існує."
 
 #: ../camel/providers/sendmail/camel-sendmail-provider.c:38
 msgid "Sendmail"
@@ -4465,128 +4570,128 @@
 msgid "For delivering mail by connecting to a remote mailhub using SMTP."
 msgstr "Доставка пошти шляхом з'єднання з віддаленим поштовим сервером SMTP."
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:166
+#: ../camel/providers/smtp/camel-smtp-transport.c:168
 msgid "Syntax error, command unrecognized"
 msgstr "Синтаксична помилка, команду не розпізнано"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:168
+#: ../camel/providers/smtp/camel-smtp-transport.c:170
 msgid "Syntax error in parameters or arguments"
 msgstr "Синтаксична помилка у параметрах чи аргументах"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:170
+#: ../camel/providers/smtp/camel-smtp-transport.c:172
 msgid "Command not implemented"
 msgstr "Команди не реалізовано"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:172
+#: ../camel/providers/smtp/camel-smtp-transport.c:174
 msgid "Command parameter not implemented"
 msgstr "Параметр команди не реалізовано"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:174
+#: ../camel/providers/smtp/camel-smtp-transport.c:176
 msgid "System status, or system help reply"
 msgstr "Стан системи або відповідь довідки системи"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:176
+#: ../camel/providers/smtp/camel-smtp-transport.c:178
 msgid "Help message"
 msgstr "Довідкове повідомлення"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:178
+#: ../camel/providers/smtp/camel-smtp-transport.c:180
 msgid "Service ready"
 msgstr "Служба готова"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:180
+#: ../camel/providers/smtp/camel-smtp-transport.c:182
 msgid "Service closing transmission channel"
 msgstr "Служба закриває канал передачі"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:182
+#: ../camel/providers/smtp/camel-smtp-transport.c:184
 msgid "Service not available, closing transmission channel"
 msgstr "Служба не доступна, канал передачі закривається"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:184
+#: ../camel/providers/smtp/camel-smtp-transport.c:186
 msgid "Requested mail action okay, completed"
 msgstr "Запитана поштова дія успішно виконана"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:186
+#: ../camel/providers/smtp/camel-smtp-transport.c:188
 msgid "User not local; will forward to "
 msgstr "Користувач не локальний; буде відправлено на <шлях-перенаправлення>"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:188
+#: ../camel/providers/smtp/camel-smtp-transport.c:190
 msgid "Requested mail action not taken: mailbox unavailable"
 msgstr "Запитана дія з поштою не виконана: поштова скринька недоступна"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:190
+#: ../camel/providers/smtp/camel-smtp-transport.c:192
 msgid "Requested action not taken: mailbox unavailable"
 msgstr "Запитана дія не виконана: поштова скринька недоступна"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:192
+#: ../camel/providers/smtp/camel-smtp-transport.c:194
 msgid "Requested action aborted: error in processing"
 msgstr "Запитану дію перервано: помилка при обробці"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:194
+#: ../camel/providers/smtp/camel-smtp-transport.c:196
 msgid "User not local; please try "
 msgstr "Користувач не локальний; встановіть <шлях-перенаправлення>"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:196
+#: ../camel/providers/smtp/camel-smtp-transport.c:198
 msgid "Requested action not taken: insufficient system storage"
 msgstr "Запитану дію не виконано: недостатньо місця у системному сховищі"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:198
+#: ../camel/providers/smtp/camel-smtp-transport.c:200
 msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr "Запитану дію не виконано: скінчився вільний простір у сховищі"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:200
+#: ../camel/providers/smtp/camel-smtp-transport.c:202
 msgid "Requested action not taken: mailbox name not allowed"
 msgstr "Запитану дію не виконано: неприпустиме ім'я поштової скриньки"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:202
+#: ../camel/providers/smtp/camel-smtp-transport.c:204
 msgid "Start mail input; end with ."
 msgstr "Починається введення пошти; закінчення після  ."
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:204
+#: ../camel/providers/smtp/camel-smtp-transport.c:206
 msgid "Transaction failed"
 msgstr "Збій транзакції"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:208
+#: ../camel/providers/smtp/camel-smtp-transport.c:210
 msgid "A password transition is needed"
 msgstr "Потрібно передати пароль"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:210
+#: ../camel/providers/smtp/camel-smtp-transport.c:212
 msgid "Authentication mechanism is too weak"
 msgstr "Механізм автентифікації надто слабкий"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:212
+#: ../camel/providers/smtp/camel-smtp-transport.c:214
 msgid "Encryption required for requested authentication mechanism"
 msgstr "Запитаний механізм автентифікації потребує шифрування"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:214
+#: ../camel/providers/smtp/camel-smtp-transport.c:216
 msgid "Temporary authentication failure"
 msgstr "Тимчасовий збій автентифікації"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:295
+#: ../camel/providers/smtp/camel-smtp-transport.c:297
 msgid "Welcome response error"
 msgstr "Помилка відповіді на запрошення"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:330
-#: ../camel/providers/smtp/camel-smtp-transport.c:363
-#: ../camel/providers/smtp/camel-smtp-transport.c:369
+#: ../camel/providers/smtp/camel-smtp-transport.c:332
+#: ../camel/providers/smtp/camel-smtp-transport.c:365
+#: ../camel/providers/smtp/camel-smtp-transport.c:371
 #, c-format
 msgid "Failed to connect to SMTP server %s in secure mode: %s"
 msgstr "Не вдається під'єднатись до POP серверу %s в безпечному режимі: %s"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:339
+#: ../camel/providers/smtp/camel-smtp-transport.c:341
 #, c-format
 msgid "STARTTLS command failed: %s"
 msgstr "Помилка команди STARTTLS: %s"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:354
+#: ../camel/providers/smtp/camel-smtp-transport.c:356
 msgid "STARTTLS command failed"
 msgstr "Помилка команди STARTTLS"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:494
+#: ../camel/providers/smtp/camel-smtp-transport.c:497
 #, c-format
 msgid "SMTP server %s does not support requested authentication type %s."
 msgstr "SMTP сервер %s не підтримує автентифікацію %s типу."
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:559
+#: ../camel/providers/smtp/camel-smtp-transport.c:568
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -4597,94 +4702,94 @@
 "%s\n"
 "\n"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:683
+#: ../camel/providers/smtp/camel-smtp-transport.c:701
 #, c-format
 msgid "SMTP server %s"
 msgstr "Сервер SMTP %s"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:685
+#: ../camel/providers/smtp/camel-smtp-transport.c:703
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "Постачання пошти SMTP через %s"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:703
+#: ../camel/providers/smtp/camel-smtp-transport.c:721
 msgid "Cannot send message: service not connected."
 msgstr "Не вдається відіслати повідомлення: немає зв'язку з службою."
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:709
+#: ../camel/providers/smtp/camel-smtp-transport.c:727
 msgid "Cannot send message: sender address not valid."
 msgstr "Не вдається відіслати повідомлення: неправильна адреса відправника."
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:713
+#: ../camel/providers/smtp/camel-smtp-transport.c:731
 msgid "Sending message"
 msgstr "Відсилання повідомлення"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:728
+#: ../camel/providers/smtp/camel-smtp-transport.c:746
 msgid "Cannot send message: no recipients defined."
 msgstr "Не вдається відіслати повідомлення: не визначені отримувачі."
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:739
+#: ../camel/providers/smtp/camel-smtp-transport.c:757
 msgid "Cannot send message: one or more invalid recipients"
 msgstr ""
 "Не вдається відіслати повідомлення: один або більше неправильних отримувачів"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:968
+#: ../camel/providers/smtp/camel-smtp-transport.c:986
 msgid "SMTP Greeting"
 msgstr "Привітання SMTP"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:993
+#: ../camel/providers/smtp/camel-smtp-transport.c:1011
 #, c-format
 msgid "HELO command failed: %s"
 msgstr "Помилка команди HELO: %s"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1010
+#: ../camel/providers/smtp/camel-smtp-transport.c:1028
 msgid "HELO command failed"
 msgstr "Помилка команди HELO"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1073
+#: ../camel/providers/smtp/camel-smtp-transport.c:1094
 msgid "SMTP Authentication"
 msgstr "Автентифікація SMTP"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1079
+#: ../camel/providers/smtp/camel-smtp-transport.c:1100
 msgid "Error creating SASL authentication object."
 msgstr "Помилка створення об'єкту автентифікації SASL"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1096
-#: ../camel/providers/smtp/camel-smtp-transport.c:1107
+#: ../camel/providers/smtp/camel-smtp-transport.c:1117
+#: ../camel/providers/smtp/camel-smtp-transport.c:1128
 #, c-format
 msgid "AUTH command failed: %s"
 msgstr "Помилка команди AUTH: %s"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1113
+#: ../camel/providers/smtp/camel-smtp-transport.c:1134
 msgid "AUTH command failed"
 msgstr "Помилка команди AUTH"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1177
+#: ../camel/providers/smtp/camel-smtp-transport.c:1204
 msgid "Bad authentication response from server.\n"
 msgstr "Неправильна відповідь автентифікації від сервера.\n"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1202
+#: ../camel/providers/smtp/camel-smtp-transport.c:1231
 #, c-format
 msgid "MAIL FROM command failed: %s: mail not sent"
 msgstr "Помилка команди MAIL FROM: %s: пошту не відіслано"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1219
+#: ../camel/providers/smtp/camel-smtp-transport.c:1248
 msgid "MAIL FROM command failed"
 msgstr "Помилка команди MAIL FROM"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1243
+#: ../camel/providers/smtp/camel-smtp-transport.c:1272
 #, c-format
 msgid "RCPT TO command failed: %s: mail not sent"
 msgstr "Помилка команди RCPT TO: %s: пошту не відіслано"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1262
+#: ../camel/providers/smtp/camel-smtp-transport.c:1291
 #, c-format
 msgid "RCPT TO <%s> failed"
 msgstr "Помилка команди RCPT TO <%s>"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1301
-#: ../camel/providers/smtp/camel-smtp-transport.c:1359
-#: ../camel/providers/smtp/camel-smtp-transport.c:1378
+#: ../camel/providers/smtp/camel-smtp-transport.c:1331
+#: ../camel/providers/smtp/camel-smtp-transport.c:1400
+#: ../camel/providers/smtp/camel-smtp-transport.c:1419
 #, c-format
 msgid "DATA command failed: %s: mail not sent"
 msgstr "Помилка команди DATA: %s: пошту не відіслано"
@@ -4692,26 +4797,26 @@
 #. we should have gotten instructions on how to use the DATA command:
 #. * 354 Enter mail, end with "." on a line by itself
 #.
-#: ../camel/providers/smtp/camel-smtp-transport.c:1318
-#: ../camel/providers/smtp/camel-smtp-transport.c:1394
+#: ../camel/providers/smtp/camel-smtp-transport.c:1348
+#: ../camel/providers/smtp/camel-smtp-transport.c:1435
 msgid "DATA command failed"
 msgstr "Помилка команди DATA"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1417
+#: ../camel/providers/smtp/camel-smtp-transport.c:1458
 #, c-format
 msgid "RSET command failed: %s"
 msgstr "Помилка команди RSET: %s"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1433
+#: ../camel/providers/smtp/camel-smtp-transport.c:1474
 msgid "RSET command failed"
 msgstr "Помилка команди RSET"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1456
+#: ../camel/providers/smtp/camel-smtp-transport.c:1497
 #, c-format
 msgid "QUIT command failed: %s"
 msgstr "Помилка команди QUIT: %s"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1470
+#: ../camel/providers/smtp/camel-smtp-transport.c:1511
 msgid "QUIT command failed"
 msgstr "Помилка команди QUIT"
 
@@ -4772,27 +4877,28 @@
 msgid "Phone Calls"
 msgstr "Телефонні дзвінки"
 
-#: ../libedataserver/e-categories.c:60
+#. Translators: "Status" is a category name; it can mean anything user wants to
+#: ../libedataserver/e-categories.c:61
 msgid "Status"
 msgstr "Статус"
 
-#: ../libedataserver/e-categories.c:61
+#: ../libedataserver/e-categories.c:62
 msgid "Strategies"
 msgstr "Стратегії"
 
-#: ../libedataserver/e-categories.c:62
+#: ../libedataserver/e-categories.c:63
 msgid "Suppliers"
 msgstr "Постачальники"
 
-#: ../libedataserver/e-categories.c:63
+#: ../libedataserver/e-categories.c:64
 msgid "Time & Expenses"
 msgstr "Час та видатки"
 
-#: ../libedataserver/e-categories.c:64
+#: ../libedataserver/e-categories.c:65
 msgid "VIP"
 msgstr "VIP"
 
-#: ../libedataserver/e-categories.c:65
+#: ../libedataserver/e-categories.c:66
 msgid "Waiting"
 msgstr "Очікування"
 
@@ -4924,26 +5030,26 @@
 msgid "%I %p"
 msgstr "%I %p"
 
-#: ../libedataserverui/e-book-auth-util.c:89
+#: ../libedataserverui/e-book-auth-util.c:90
 msgid "Accessing LDAP Server anonymously"
 msgstr "Анонімний доступ до сервера LDAP"
 
-#: ../libedataserverui/e-book-auth-util.c:193
+#: ../libedataserverui/e-book-auth-util.c:192
 msgid "Failed to authenticate.\n"
 msgstr "Не вдається пройти автентифікацію.\n"
 
-#: ../libedataserverui/e-categories-dialog.c:274
+#: ../libedataserverui/e-categories-dialog.c:261
 #, c-format
 msgid ""
 "There is already a category '%s' in the configuration. Please use another "
 "name"
 msgstr "Категорія з назвою '%s' вже існує. Використовуйте іншу назву"
 
-#: ../libedataserverui/e-categories-dialog.c:475
+#: ../libedataserverui/e-categories-dialog.c:466
 msgid "Icon"
 msgstr "Значок"
 
-#: ../libedataserverui/e-categories-dialog.c:480
+#: ../libedataserverui/e-categories-dialog.c:471
 msgid "Category"
 msgstr "Категорія"
 
@@ -4979,19 +5085,19 @@
 msgid "categories"
 msgstr "категорії"
 
-#: ../libedataserverui/e-name-selector-dialog.c:275
+#: ../libedataserverui/e-name-selector-dialog.c:272
 msgid "Select Contacts from Address Book"
 msgstr "Вибір контактів з адресної книги"
 
-#: ../libedataserverui/e-name-selector-dialog.c:555
+#: ../libedataserverui/e-name-selector-dialog.c:559
 msgid "_Add"
 msgstr "_Додати"
 
-#: ../libedataserverui/e-name-selector-dialog.c:580
+#: ../libedataserverui/e-name-selector-dialog.c:584
 msgid "_Remove"
 msgstr "В_идалити"
 
-#: ../libedataserverui/e-name-selector-dialog.c:753
+#: ../libedataserverui/e-name-selector-dialog.c:761
 #: ../libedataserverui/e-name-selector-dialog.glade.h:6
 msgid "Any Category"
 msgstr "Будь-яка категорія"
@@ -5034,67 +5140,76 @@
 msgstr "_Шукати:"
 
 #. To Translators: This would be similiar to "Expand MyList Inline" where MyList is a Contact List
-#: ../libedataserverui/e-name-selector-entry.c:2249
+#: ../libedataserverui/e-name-selector-entry.c:2369
 #, c-format
 msgid "E_xpand %s Inline"
 msgstr "_Розгорнути %s"
 
 #. Copy Contact Item
-#: ../libedataserverui/e-name-selector-entry.c:2264
+#: ../libedataserverui/e-name-selector-entry.c:2384
 #, c-format
 msgid "Cop_y %s"
 msgstr "_Копіювати %s"
 
 #. Cut Contact Item
-#: ../libedataserverui/e-name-selector-entry.c:2274
+#: ../libedataserverui/e-name-selector-entry.c:2394
 #, c-format
 msgid "C_ut %s"
 msgstr "_Вирізати %s"
 
 #. Edit Contact item
-#: ../libedataserverui/e-name-selector-entry.c:2291
+#: ../libedataserverui/e-name-selector-entry.c:2411
 #, c-format
 msgid "_Edit %s"
 msgstr "_Правка %s"
 
-#: ../libedataserverui/e-name-selector-list.c:479
+#: ../libedataserverui/e-name-selector-list.c:466
 #, c-format
 msgid "_Delete %s"
 msgstr "В_идалити %s"
 
-#: ../libedataserverui/e-passwords.c:986
+#: ../libedataserverui/e-passwords.c:234
+#, c-format
+msgid "Keyring key is unusable: no user or host name"
+msgstr "Ключ з в'язки ключів некоректний: відсутнє ім'я користувача або вузла"
+
+#: ../libedataserverui/e-passwords.c:1094
+msgid "You have the Caps Lock key on."
+msgstr "На клавіатурі увімкнено Caps Lock."
+
+#: ../libedataserverui/e-passwords.c:1214
 msgid "_Remember this passphrase"
 msgstr "_Запам'ятати цей пароль"
 
-#: ../libedataserverui/e-passwords.c:987
+#: ../libedataserverui/e-passwords.c:1215
 msgid "_Remember this passphrase for the remainder of this session"
 msgstr "_Пам'ятати цей пароль до закінчення поточного сеансу"
 
-#: ../libedataserverui/e-passwords.c:992
+#: ../libedataserverui/e-passwords.c:1220
 msgid "_Remember this password"
 msgstr "_Запам'ятати цей пароль"
 
-#: ../libedataserverui/e-passwords.c:993
+#: ../libedataserverui/e-passwords.c:1221
 msgid "_Remember this password for the remainder of this session"
 msgstr "_Пам'ятати цей пароль до закінчення поточного сеансу"
 
 #. prepare the dialog
-#: ../libedataserverui/e-source-selector-dialog.c:101
+#: ../libedataserverui/e-source-selector-dialog.c:95
 msgid "Select destination"
 msgstr "Виберіть призначення"
 
-#: ../libedataserverui/e-source-selector-dialog.c:154
+#: ../libedataserverui/e-source-selector-dialog.c:148
 msgid "_Destination"
 msgstr "_Призначення"
 
-#: ../servers/exchange/lib/e2k-autoconfig.c:1660
-#: ../servers/exchange/storage/exchange-account.c:939
+#: ../servers/exchange/lib/e2k-autoconfig.c:1683
+#: ../servers/exchange/storage/exchange-account.c:961
 #, c-format
 msgid "Enter password for %s"
 msgstr "Введіть пароль для %s"
 
-#: ../servers/exchange/lib/e2k-autoconfig.c:1661
-#: ../servers/exchange/storage/exchange-account.c:944
+#: ../servers/exchange/lib/e2k-autoconfig.c:1684
+#: ../servers/exchange/storage/exchange-account.c:966
 msgid "Enter password"
 msgstr "Ввід паролю"
 
@@ -5198,26 +5313,26 @@
 
 #. i18n: This is the title of an "other user's folders"
 #. hierarchy. Eg, "John Doe's Folders".
-#: ../servers/exchange/storage/exchange-account.c:635
+#: ../servers/exchange/storage/exchange-account.c:644
 #, c-format
 msgid "%s's Folders"
 msgstr "Теки %s"
 
-#: ../servers/exchange/storage/exchange-account.c:1245
+#: ../servers/exchange/storage/exchange-account.c:1267
 msgid "Personal Folders"
 msgstr "Персональні теки"
 
-#: ../servers/exchange/storage/exchange-account.c:1260
+#: ../servers/exchange/storage/exchange-account.c:1282
 msgid "Favorite Public Folders"
 msgstr "Улюблені публічні теки"
 
 #. i18n: Outlookism
-#: ../servers/exchange/storage/exchange-account.c:1277
+#: ../servers/exchange/storage/exchange-account.c:1299
 msgid "All Public Folders"
 msgstr "Усі публічні теки"
 
 #. i18n: Outlookism
-#: ../servers/exchange/storage/exchange-account.c:1291
+#: ../servers/exchange/storage/exchange-account.c:1313
 msgid "Global Address List"
 msgstr "Глобальний список адрес"
 
@@ -5245,19 +5360,19 @@
 msgid "Tasks"
 msgstr "Завдання"
 
-#: ../servers/groupwise/e-gw-connection.c:191
+#: ../servers/groupwise/e-gw-connection.c:225
 msgid "Invalid connection"
 msgstr "Неправильне з'єднання"
 
-#: ../servers/groupwise/e-gw-connection.c:195
+#: ../servers/groupwise/e-gw-connection.c:229
 msgid "Invalid response from server"
 msgstr "Неправильна відповідь від сервера."
 
-#: ../servers/groupwise/e-gw-connection.c:197
+#: ../servers/groupwise/e-gw-connection.c:231
 msgid "No response from the server"
 msgstr "Немає відповіді від сервера"
 
-#: ../servers/groupwise/e-gw-connection.c:203
+#: ../servers/groupwise/e-gw-connection.c:237
 msgid "Bad parameter"
 msgstr "Неправильний параметр"
 
@@ -5278,7 +5393,7 @@
 msgstr "Служба журналу сервера даних Evolution"
 
 #. dialog display isn't working out
-#: ../src/server.c:110
+#: ../src/server.c:109
 #, c-format
 msgid "Multiple segmentation faults occurred; cannot display error dialog\n"
 msgstr ""
@@ -5293,4 +5408,5 @@
 msgid "The color to render"
 msgstr "Колір для виводу"
 
-
+#~ msgid "Unsupported operation: count by expression: for %s"
+#~ msgstr "Операція не підтримується: підрахунок за виразом: для %s"
diff -Nru evolution-data-server-2.24.1/servers/groupwise/build-timestamp.h evolution-data-server-2.24.1.1/servers/groupwise/build-timestamp.h
--- evolution-data-server-2.24.1/servers/groupwise/build-timestamp.h	2008-10-20 05:33:48.000000000 +0200
+++ evolution-data-server-2.24.1.1/servers/groupwise/build-timestamp.h	2008-11-07 06:18:27.000000000 +0100
@@ -1 +1 @@
-const char *build_timestamp = "Evolution-Data-Server-2.24-2008-10-20";
+const char *build_timestamp = "Evolution-Data-Server-2.24-2008-11-07";
diff -Nru evolution-data-server-2.24.1/servers/groupwise/ChangeLog evolution-data-server-2.24.1.1/servers/groupwise/ChangeLog
--- evolution-data-server-2.24.1/servers/groupwise/ChangeLog	2008-10-20 05:28:11.000000000 +0200
+++ evolution-data-server-2.24.1.1/servers/groupwise/ChangeLog	2008-11-07 05:34:23.000000000 +0100
@@ -1,3 +1,22 @@
+2008-10-31  Matthew Barnes  
+
+	** Fixes part of bug #558727 (crash by Frederic van Starbmann)
+
+	* create-account.c (add_account):
+	Fix a potential string format crash.
+
+2008-10-31  Sankar P  
+
+	** Fix for bnc bugs #440502, #209514, #434958, #434946, 
+	#435725, #434950, #372382, #435727
+
+	* e-gw-connection.c (e_gw_connection_get_container_list),
+	(e_gw_connection_get_container_id),
+	(e_gw_connection_get_container):
+	* e-gw-connection.h:
+	* e-gw-item.c (e_gw_item_new_from_soap_parameter):
+	GroupWise improvements
+
 2008-10-03  Milan Crha  
 
 	** Part of fix for bug #547243
diff -Nru evolution-data-server-2.24.1/servers/groupwise/create-account.c evolution-data-server-2.24.1.1/servers/groupwise/create-account.c
--- evolution-data-server-2.24.1/servers/groupwise/create-account.c	2008-10-13 10:08:14.000000000 +0200
+++ evolution-data-server-2.24.1.1/servers/groupwise/create-account.c	2008-11-07 05:34:23.000000000 +0100
@@ -18,7 +18,7 @@
 
 	source_list = e_source_list_new_for_gconf (conf_client, conf_key);
 
-	group_name = g_strdup_printf (hostname);
+	group_name = g_strdup (hostname);
 	group = e_source_group_new (group_name, "groupwise://");
 	e_source_list_add_group (source_list, group, -1);
 
diff -Nru evolution-data-server-2.24.1/servers/groupwise/e-gw-connection.c evolution-data-server-2.24.1.1/servers/groupwise/e-gw-connection.c
--- evolution-data-server-2.24.1/servers/groupwise/e-gw-connection.c	2008-10-20 05:28:11.000000000 +0200
+++ evolution-data-server-2.24.1.1/servers/groupwise/e-gw-connection.c	2008-11-07 05:34:23.000000000 +0100
@@ -734,7 +734,6 @@
 	if (!cnc)
 		return E_GW_CONNECTION_STATUS_UNKNOWN;
 
-	g_return_val_if_fail (E_IS_GW_CONNECTION (cnc), E_GW_CONNECTION_STATUS_UNKNOWN);
 	g_return_val_if_fail (container_list != NULL, E_GW_CONNECTION_STATUS_UNKNOWN);
 
 	msg = e_gw_message_new_with_header (cnc->priv->uri, cnc->priv->session_id, "getFolderListRequest");
@@ -824,6 +823,49 @@
 	return container_id;
 }
 
+EGwContainer *
+e_gw_connection_get_container (EGwConnection *cnc, const char * uid)
+{
+		SoupSoapMessage *msg;
+		SoupSoapResponse *response;
+		EGwConnectionStatus status;
+
+		g_return_val_if_fail (E_IS_GW_CONNECTION (cnc), NULL);
+		g_return_val_if_fail (uid!= NULL, NULL);
+
+		msg = e_gw_message_new_with_header (cnc->priv->uri, cnc->priv->session_id, "getFolderRequest");
+		if (!msg) {
+				g_warning (G_STRLOC ": Could not build SOAP message");
+				return NULL;
+		}
+
+		e_gw_message_write_string_parameter (msg, "uid", NULL, uid);
+		e_gw_message_write_string_parameter (msg, "view", NULL, "count");
+		e_gw_message_write_footer (msg);
+
+		/* send message to server */
+		response = e_gw_connection_send_message (cnc, msg);
+		if (!response) {
+				g_object_unref (msg);
+				return NULL;
+		}
+
+		status = e_gw_connection_parse_response_status (response);
+		g_object_unref (msg);
+
+		if (status == E_GW_CONNECTION_STATUS_OK) {
+				EGwContainer *container;
+				SoupSoapParameter *subparam;
+
+				subparam = soup_soap_response_get_first_parameter_by_name (response, "folder");
+				container = e_gw_container_new_from_soap_parameter (subparam);
+
+				return container;
+		}
+
+		return NULL;
+}
+
 EGwConnectionStatus
 e_gw_connection_get_items_delta_info (EGwConnection *cnc, const char *container, gdouble *first_sequence,
 					gdouble *last_sequence, gdouble *last_po_rebuild_time )
diff -Nru evolution-data-server-2.24.1/servers/groupwise/e-gw-connection.h evolution-data-server-2.24.1.1/servers/groupwise/e-gw-connection.h
--- evolution-data-server-2.24.1/servers/groupwise/e-gw-connection.h	2008-10-13 10:08:14.000000000 +0200
+++ evolution-data-server-2.24.1.1/servers/groupwise/e-gw-connection.h	2008-11-07 05:34:23.000000000 +0100
@@ -99,9 +99,12 @@
 const char         *e_gw_connection_get_error_message (EGwConnectionStatus status);
 
 EGwConnectionStatus e_gw_connection_logout (EGwConnection *cnc);
+
 EGwConnectionStatus e_gw_connection_get_container_list (EGwConnection *cnc, const char *top, GList **container_list);
 void                e_gw_connection_free_container_list (GList *container_list);
 char               *e_gw_connection_get_container_id (EGwConnection *cnc, const char *name);
+EGwContainer * e_gw_connection_get_container (EGwConnection *cnc, const char * uid);
+
 EGwConnectionStatus e_gw_connection_get_items (EGwConnection *cnc, const char *container,
 					       const char *view, EGwFilter *filter, GList **list);
 EGwConnectionStatus e_gw_connection_get_deltas ( EGwConnection *cnc, GSList **adds, GSList **deletes, GSList **updates);
diff -Nru evolution-data-server-2.24.1/servers/groupwise/e-gw-item.c evolution-data-server-2.24.1.1/servers/groupwise/e-gw-item.c
--- evolution-data-server-2.24.1/servers/groupwise/e-gw-item.c	2008-10-20 05:28:11.000000000 +0200
+++ evolution-data-server-2.24.1.1/servers/groupwise/e-gw-item.c	2008-11-07 05:34:23.000000000 +0100
@@ -2058,7 +2058,7 @@
 		} else if (!g_ascii_strcasecmp (name, "alarm")) {
 			char *enabled;
 			enabled = soup_soap_parameter_get_property (child, "enabled");
-			if (!g_ascii_strcasecmp (enabled, "1") ) {
+			if (enabled && !g_ascii_strcasecmp (enabled, "1") ) {
 				value = soup_soap_parameter_get_string_value (child);
 				/* convert it into integer */
 				item->priv->trigger = atoi (value);