diff -Nru evolution-data-server-3.4.3/aclocal.m4 evolution-data-server-3.4.4/aclocal.m4 --- evolution-data-server-3.4.3/aclocal.m4 2012-06-18 00:10:47.000000000 +0200 +++ evolution-data-server-3.4.4/aclocal.m4 2012-08-12 23:32:07.000000000 +0200 @@ -1,4 +1,4 @@ -# generated automatically by aclocal 1.11.5 -*- Autoconf -*- +# generated automatically by aclocal 1.11.6 -*- Autoconf -*- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, # 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, @@ -542,7 +542,7 @@ [am__api_version='1.11' dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to dnl require some minimum version. Point them to the right macro. -m4_if([$1], [1.11.5], [], +m4_if([$1], [1.11.6], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -558,7 +558,7 @@ # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -[AM_AUTOMAKE_VERSION([1.11.5])dnl +[AM_AUTOMAKE_VERSION([1.11.6])dnl m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) diff -Nru evolution-data-server-3.4.3/addressbook/backends/file/e-book-backend-file.c evolution-data-server-3.4.4/addressbook/backends/file/e-book-backend-file.c --- evolution-data-server-3.4.3/addressbook/backends/file/e-book-backend-file.c 2012-06-18 00:09:39.000000000 +0200 +++ evolution-data-server-3.4.4/addressbook/backends/file/e-book-backend-file.c 2012-08-12 23:29:54.000000000 +0200 @@ -1894,7 +1894,7 @@ source = e_backend_get_source (E_BACKEND (backend)); dirname = e_book_backend_file_extract_path_from_source (source, GET_PATH_DB_DIR); - if (!g_file_test (dirname, G_FILE_TEST_IS_DIR)) { + if (only_if_exists && !g_file_test (dirname, G_FILE_TEST_IS_DIR)) { g_free (dirname); g_propagate_error (perror, EDB_ERROR (NO_SUCH_BOOK)); return; diff -Nru evolution-data-server-3.4.3/addressbook/backends/file/Makefile.in evolution-data-server-3.4.4/addressbook/backends/file/Makefile.in --- evolution-data-server-3.4.3/addressbook/backends/file/Makefile.in 2012-06-18 00:10:55.000000000 +0200 +++ evolution-data-server-3.4.4/addressbook/backends/file/Makefile.in 2012-08-12 23:32:17.000000000 +0200 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.5 from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, diff -Nru evolution-data-server-3.4.3/addressbook/backends/google/e-book-backend-google.c evolution-data-server-3.4.4/addressbook/backends/google/e-book-backend-google.c --- evolution-data-server-3.4.3/addressbook/backends/google/e-book-backend-google.c 2012-06-18 00:09:39.000000000 +0200 +++ evolution-data-server-3.4.4/addressbook/backends/google/e-book-backend-google.c 2012-08-12 23:29:54.000000000 +0200 @@ -1041,6 +1041,7 @@ } finish_operation (backend, -2, gdata_error); + g_object_unref (backend); g_clear_error (&gdata_error); } @@ -1064,6 +1065,8 @@ gdata_contacts_query_set_show_deleted (GDATA_CONTACTS_QUERY (query), TRUE); } + g_object_ref (backend); + /* Run the query asynchronously */ cancellable = start_operation (backend, -2, NULL, _("Querying for updated groups…")); gdata_contacts_service_query_groups_async ( diff -Nru evolution-data-server-3.4.3/addressbook/backends/google/Makefile.in evolution-data-server-3.4.4/addressbook/backends/google/Makefile.in --- evolution-data-server-3.4.3/addressbook/backends/google/Makefile.in 2012-06-18 00:10:55.000000000 +0200 +++ evolution-data-server-3.4.4/addressbook/backends/google/Makefile.in 2012-08-12 23:32:18.000000000 +0200 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.5 from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, diff -Nru evolution-data-server-3.4.3/addressbook/backends/ldap/Makefile.in evolution-data-server-3.4.4/addressbook/backends/ldap/Makefile.in --- evolution-data-server-3.4.3/addressbook/backends/ldap/Makefile.in 2012-06-18 00:10:55.000000000 +0200 +++ evolution-data-server-3.4.4/addressbook/backends/ldap/Makefile.in 2012-08-12 23:32:18.000000000 +0200 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.5 from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, diff -Nru evolution-data-server-3.4.3/addressbook/backends/Makefile.in evolution-data-server-3.4.4/addressbook/backends/Makefile.in --- evolution-data-server-3.4.3/addressbook/backends/Makefile.in 2012-06-18 00:10:54.000000000 +0200 +++ evolution-data-server-3.4.4/addressbook/backends/Makefile.in 2012-08-12 23:32:17.000000000 +0200 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.5 from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, diff -Nru evolution-data-server-3.4.3/addressbook/backends/vcf/Makefile.in evolution-data-server-3.4.4/addressbook/backends/vcf/Makefile.in --- evolution-data-server-3.4.3/addressbook/backends/vcf/Makefile.in 2012-06-18 00:10:56.000000000 +0200 +++ evolution-data-server-3.4.4/addressbook/backends/vcf/Makefile.in 2012-08-12 23:32:19.000000000 +0200 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.5 from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, diff -Nru evolution-data-server-3.4.3/addressbook/backends/webdav/Makefile.in evolution-data-server-3.4.4/addressbook/backends/webdav/Makefile.in --- evolution-data-server-3.4.3/addressbook/backends/webdav/Makefile.in 2012-06-18 00:10:56.000000000 +0200 +++ evolution-data-server-3.4.4/addressbook/backends/webdav/Makefile.in 2012-08-12 23:32:19.000000000 +0200 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.5 from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, diff -Nru evolution-data-server-3.4.3/addressbook/libebook/Makefile.in evolution-data-server-3.4.4/addressbook/libebook/Makefile.in --- evolution-data-server-3.4.3/addressbook/libebook/Makefile.in 2012-06-18 00:10:57.000000000 +0200 +++ evolution-data-server-3.4.4/addressbook/libebook/Makefile.in 2012-08-12 23:32:19.000000000 +0200 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.5 from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, diff -Nru evolution-data-server-3.4.3/addressbook/libedata-book/Makefile.in evolution-data-server-3.4.4/addressbook/libedata-book/Makefile.in --- evolution-data-server-3.4.3/addressbook/libedata-book/Makefile.in 2012-06-18 00:10:57.000000000 +0200 +++ evolution-data-server-3.4.4/addressbook/libedata-book/Makefile.in 2012-08-12 23:32:20.000000000 +0200 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.5 from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, diff -Nru evolution-data-server-3.4.3/addressbook/libegdbus/Makefile.in evolution-data-server-3.4.4/addressbook/libegdbus/Makefile.in --- evolution-data-server-3.4.3/addressbook/libegdbus/Makefile.in 2012-06-18 00:10:58.000000000 +0200 +++ evolution-data-server-3.4.4/addressbook/libegdbus/Makefile.in 2012-08-12 23:32:20.000000000 +0200 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.5 from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, diff -Nru evolution-data-server-3.4.3/addressbook/Makefile.in evolution-data-server-3.4.4/addressbook/Makefile.in --- evolution-data-server-3.4.3/addressbook/Makefile.in 2012-06-18 00:10:54.000000000 +0200 +++ evolution-data-server-3.4.4/addressbook/Makefile.in 2012-08-12 23:32:17.000000000 +0200 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.5 from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, diff -Nru evolution-data-server-3.4.3/art/Makefile.in evolution-data-server-3.4.4/art/Makefile.in --- evolution-data-server-3.4.3/art/Makefile.in 2012-06-18 00:10:58.000000000 +0200 +++ evolution-data-server-3.4.4/art/Makefile.in 2012-08-12 23:32:21.000000000 +0200 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.5 from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, diff -Nru evolution-data-server-3.4.3/calendar/backends/caldav/Makefile.in evolution-data-server-3.4.4/calendar/backends/caldav/Makefile.in --- evolution-data-server-3.4.3/calendar/backends/caldav/Makefile.in 2012-06-18 00:10:59.000000000 +0200 +++ evolution-data-server-3.4.4/calendar/backends/caldav/Makefile.in 2012-08-12 23:32:22.000000000 +0200 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.5 from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, diff -Nru evolution-data-server-3.4.3/calendar/backends/contacts/e-cal-backend-contacts.c evolution-data-server-3.4.4/calendar/backends/contacts/e-cal-backend-contacts.c --- evolution-data-server-3.4.3/calendar/backends/contacts/e-cal-backend-contacts.c 2012-06-18 00:09:39.000000000 +0200 +++ evolution-data-server-3.4.4/calendar/backends/contacts/e-cal-backend-contacts.c 2012-08-12 23:29:54.000000000 +0200 @@ -67,7 +67,7 @@ struct _ECalBackendContactsPrivate { ESourceList *addressbook_sources; - GMutex *mutex; /* guards 'addressbooks' and 'credentials' */ + GRecMutex rec_mutex; /* guards 'addressbooks' and 'credentials' */ GHashTable *addressbooks; /* UID -> BookRecord */ GHashTable *credentials; /* UID -> ECredentials to use in "authenticate" handler */ gboolean loaded; @@ -138,7 +138,7 @@ source_uid = e_source_peek_uid (source); g_return_val_if_fail (source_uid != NULL, FALSE); - g_mutex_lock (cbc->priv->mutex); + g_rec_mutex_lock (&cbc->priv->rec_mutex); use_credentials = g_hash_table_lookup (cbc->priv->credentials, source_uid); if (use_credentials && @@ -160,12 +160,12 @@ e_credentials_set (use_credentials, CBC_CREDENTIALS_KEY_ALREADY_USED, "1"); g_slist_free (keys); - g_mutex_unlock (cbc->priv->mutex); + g_rec_mutex_unlock (&cbc->priv->rec_mutex); return TRUE; } - g_mutex_unlock (cbc->priv->mutex); + g_rec_mutex_unlock (&cbc->priv->rec_mutex); /* write properties on a copy of original credentials */ credentials = e_credentials_new_clone (credentials); @@ -339,14 +339,14 @@ source_uid = e_source_peek_uid (source); g_return_if_fail (source_uid != NULL); - g_mutex_lock (cbc->priv->mutex); + g_rec_mutex_lock (&cbc->priv->rec_mutex); br = g_hash_table_lookup (cbc->priv->addressbooks, source_uid); if (br && br->book_client != book_client) br = NULL; if (!br) { - g_mutex_unlock (cbc->priv->mutex); + g_rec_mutex_unlock (&cbc->priv->rec_mutex); return; } @@ -393,7 +393,7 @@ br->book_view = book_view; } - g_mutex_unlock (cbc->priv->mutex); + g_rec_mutex_unlock (&cbc->priv->rec_mutex); } static void @@ -415,14 +415,14 @@ source_uid = e_credentials_peek (credentials, CBC_CREDENTIALS_KEY_SOURCE_UID); g_return_if_fail (source_uid != NULL); - g_mutex_lock (cbc->priv->mutex); + g_rec_mutex_lock (&cbc->priv->rec_mutex); br = g_hash_table_lookup (cbc->priv->addressbooks, source_uid); if (!br || !br->book_client || /* no username means user cancelled password prompt */ !e_credentials_has_key (credentials, E_CREDENTIALS_KEY_USERNAME)) { g_hash_table_remove (cbc->priv->credentials, source_uid); - g_mutex_unlock (cbc->priv->mutex); + g_rec_mutex_unlock (&cbc->priv->rec_mutex); return; } @@ -430,7 +430,7 @@ cbc_reopen_book_client (cbc, br->book_client); - g_mutex_unlock (cbc->priv->mutex); + g_rec_mutex_unlock (&cbc->priv->rec_mutex); } /* BookRecord methods */ @@ -461,9 +461,9 @@ br->book_client = book_client; br->book_view = NULL; - g_mutex_lock (cbc->priv->mutex); + g_rec_mutex_lock (&cbc->priv->rec_mutex); g_hash_table_insert (cbc->priv->addressbooks, g_strdup (uid), br); - g_mutex_unlock (cbc->priv->mutex); + g_rec_mutex_unlock (&cbc->priv->rec_mutex); if (!e_client_open_sync (E_CLIENT (book_client), TRUE, NULL, &error) || error) { g_signal_handlers_disconnect_by_func (book_client, G_CALLBACK (book_client_authenticate_cb), cbc); @@ -473,13 +473,13 @@ g_error_free (error); } - g_mutex_lock (cbc->priv->mutex); + g_rec_mutex_lock (&cbc->priv->rec_mutex); /* removal also frees the 'br' struct */ g_hash_table_remove (cbc->priv->addressbooks, uid); g_hash_table_remove (cbc->priv->credentials, uid); - g_mutex_unlock (cbc->priv->mutex); + g_rec_mutex_unlock (&cbc->priv->rec_mutex); } } @@ -666,12 +666,12 @@ g_return_if_fail (cbc); - g_mutex_lock (cbc->priv->mutex); + g_rec_mutex_lock (&cbc->priv->rec_mutex); g_hash_table_remove (cbc->priv->addressbooks, uid); g_hash_table_remove (cbc->priv->credentials, uid); - g_mutex_unlock (cbc->priv->mutex); + g_rec_mutex_unlock (&cbc->priv->rec_mutex); } static void @@ -700,7 +700,7 @@ if (!uid) continue; - g_mutex_lock (cbc->priv->mutex); + g_rec_mutex_lock (&cbc->priv->rec_mutex); if (is_source_usable (source, group)) { if (!g_hash_table_lookup (cbc->priv->addressbooks, uid)) @@ -709,7 +709,7 @@ source_removed_cb (group, source, cbc); } - g_mutex_unlock (cbc->priv->mutex); + g_rec_mutex_unlock (&cbc->priv->rec_mutex); } } } @@ -744,7 +744,7 @@ g_return_if_fail (cbc); - g_mutex_lock (cbc->priv->mutex); + g_rec_mutex_lock (&cbc->priv->rec_mutex); /* Unload all address books from this group */ for (i = e_source_group_peek_sources (group); i; i = i->next) { @@ -755,7 +755,7 @@ g_hash_table_remove (cbc->priv->credentials, uid); } - g_mutex_unlock (cbc->priv->mutex); + g_rec_mutex_unlock (&cbc->priv->rec_mutex); } /************************************************************************************/ @@ -1551,7 +1551,7 @@ gconf_client_notify_remove (priv->conf_client, priv->notifyid3); g_object_unref (priv->conf_client); - g_mutex_free (priv->mutex); + g_rec_mutex_clear (&priv->rec_mutex); /* Chain up to parent's finalize() method. */ G_OBJECT_CLASS (e_cal_backend_contacts_parent_class)->finalize (object); @@ -1566,7 +1566,7 @@ if (!e_book_client_get_sources (&cbc->priv->addressbook_sources, NULL)) cbc->priv->addressbook_sources = NULL; - cbc->priv->mutex = g_mutex_new (); + g_rec_mutex_init (&cbc->priv->rec_mutex); cbc->priv->addressbooks = g_hash_table_new_full ( (GHashFunc) g_str_hash, diff -Nru evolution-data-server-3.4.3/calendar/backends/contacts/Makefile.in evolution-data-server-3.4.4/calendar/backends/contacts/Makefile.in --- evolution-data-server-3.4.3/calendar/backends/contacts/Makefile.in 2012-06-18 00:10:59.000000000 +0200 +++ evolution-data-server-3.4.4/calendar/backends/contacts/Makefile.in 2012-08-12 23:32:22.000000000 +0200 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.5 from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, diff -Nru evolution-data-server-3.4.3/calendar/backends/file/Makefile.in evolution-data-server-3.4.4/calendar/backends/file/Makefile.in --- evolution-data-server-3.4.3/calendar/backends/file/Makefile.in 2012-06-18 00:11:00.000000000 +0200 +++ evolution-data-server-3.4.4/calendar/backends/file/Makefile.in 2012-08-12 23:32:23.000000000 +0200 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.5 from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, diff -Nru evolution-data-server-3.4.3/calendar/backends/http/Makefile.in evolution-data-server-3.4.4/calendar/backends/http/Makefile.in --- evolution-data-server-3.4.3/calendar/backends/http/Makefile.in 2012-06-18 00:11:00.000000000 +0200 +++ evolution-data-server-3.4.4/calendar/backends/http/Makefile.in 2012-08-12 23:32:23.000000000 +0200 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.5 from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, diff -Nru evolution-data-server-3.4.3/calendar/backends/Makefile.in evolution-data-server-3.4.4/calendar/backends/Makefile.in --- evolution-data-server-3.4.3/calendar/backends/Makefile.in 2012-06-18 00:10:59.000000000 +0200 +++ evolution-data-server-3.4.4/calendar/backends/Makefile.in 2012-08-12 23:32:21.000000000 +0200 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.5 from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, diff -Nru evolution-data-server-3.4.3/calendar/backends/weather/Makefile.in evolution-data-server-3.4.4/calendar/backends/weather/Makefile.in --- evolution-data-server-3.4.3/calendar/backends/weather/Makefile.in 2012-06-18 00:11:01.000000000 +0200 +++ evolution-data-server-3.4.4/calendar/backends/weather/Makefile.in 2012-08-12 23:32:23.000000000 +0200 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.5 from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, diff -Nru evolution-data-server-3.4.3/calendar/libecal/e-cal.c evolution-data-server-3.4.4/calendar/libecal/e-cal.c --- evolution-data-server-3.4.3/calendar/libecal/e-cal.c 2012-06-18 00:08:12.000000000 +0200 +++ evolution-data-server-3.4.4/calendar/libecal/e-cal.c 2012-08-12 23:29:54.000000000 +0200 @@ -2997,12 +2997,15 @@ ECalComponentRange *range; ECalComponentDateTime datetime; + datetime.value = NULL; + datetime.tzid = NULL; + e_cal_component_get_dtstart (comp, &datetime); if (instances_hold->start_zone) - itt = icaltime_from_timet_with_zone (start, datetime.value->is_date, instances_hold->start_zone); + itt = icaltime_from_timet_with_zone (start, datetime.value && datetime.value->is_date, instances_hold->start_zone); else { - itt = icaltime_from_timet (start, datetime.value->is_date); + itt = icaltime_from_timet (start, datetime.value && datetime.value->is_date); if (datetime.tzid) { g_free ((gchar *) datetime.tzid); @@ -3243,7 +3246,7 @@ * For DATE values and DATE-TIME values without a * TZID (i.e. floating times) we use the default * timezone. */ - if (dtstart.tzid && !dtstart.value->is_date) { + if (dtstart.tzid && dtstart.value && !dtstart.value->is_date) { start_zone = e_cal_resolve_tzid_cb (dtstart.tzid, ecal); if (!start_zone) start_zone = default_zone; @@ -3251,7 +3254,7 @@ start_zone = default_zone; } - if (dtend.tzid && !dtend.value->is_date) { + if (dtend.tzid && dtend.value && !dtend.value->is_date) { end_zone = e_cal_resolve_tzid_cb (dtend.tzid, ecal); if (!end_zone) end_zone = default_zone; diff -Nru evolution-data-server-3.4.3/calendar/libecal/e-cal-client.c evolution-data-server-3.4.4/calendar/libecal/e-cal-client.c --- evolution-data-server-3.4.3/calendar/libecal/e-cal-client.c 2012-06-18 00:08:12.000000000 +0200 +++ evolution-data-server-3.4.4/calendar/libecal/e-cal-client.c 2012-08-12 23:29:54.000000000 +0200 @@ -1277,12 +1277,17 @@ ECalComponentDateTime dtstart, dtend; /* update DTSTART */ + dtstart.value = NULL; + dtstart.tzid = NULL; + e_cal_component_get_dtstart (comp, &dtstart); - if (instances_hold->start_zone) - itt = icaltime_from_timet_with_zone (start, dtstart.value->is_date, instances_hold->start_zone); - else { - itt = icaltime_from_timet (start, dtstart.value->is_date); + if (instances_hold->start_zone) { + itt = icaltime_from_timet_with_zone (start, dtstart.value && dtstart.value->is_date, instances_hold->start_zone); + g_free ((gchar *) dtstart.tzid); + dtstart.tzid = g_strdup (icaltimezone_get_tzid (instances_hold->start_zone)); + } else { + itt = icaltime_from_timet (start, dtstart.value && dtstart.value->is_date); if (dtstart.tzid) { g_free ((gchar *) dtstart.tzid); dtstart.tzid = NULL; @@ -1305,12 +1310,17 @@ g_free ((gchar *) dtstart.tzid); /* Update DTEND */ + dtend.value = NULL; + dtend.tzid = NULL; + e_cal_component_get_dtend (comp, &dtend); - if (instances_hold->end_zone) - itt = icaltime_from_timet_with_zone (end, dtend.value->is_date, instances_hold->end_zone); - else { - itt = icaltime_from_timet (end, dtend.value->is_date); + if (instances_hold->end_zone) { + itt = icaltime_from_timet_with_zone (end, dtend.value && dtend.value->is_date, instances_hold->end_zone); + g_free ((gchar *) dtend.tzid); + dtend.tzid = g_strdup (icaltimezone_get_tzid (instances_hold->end_zone)); + } else { + itt = icaltime_from_timet (end, dtend.value && dtend.value->is_date); if (dtend.tzid) { g_free ((gchar *) dtend.tzid); dtend.tzid = NULL; @@ -1497,7 +1507,7 @@ * For DATE values and DATE-TIME values without a * TZID (i.e. floating times) we use the default * timezone. */ - if (dtstart.tzid && !dtstart.value->is_date) { + if (dtstart.tzid && dtstart.value && !dtstart.value->is_date) { start_zone = e_cal_client_resolve_tzid_cb (dtstart.tzid, client); if (!start_zone) start_zone = default_zone; @@ -1505,7 +1515,7 @@ start_zone = default_zone; } - if (dtend.tzid && !dtend.value->is_date) { + if (dtend.tzid && dtend.value && !dtend.value->is_date) { end_zone = e_cal_client_resolve_tzid_cb (dtend.tzid, client); if (!end_zone) end_zone = default_zone; diff -Nru evolution-data-server-3.4.3/calendar/libecal/e-cal-system-timezone.c evolution-data-server-3.4.4/calendar/libecal/e-cal-system-timezone.c --- evolution-data-server-3.4.3/calendar/libecal/e-cal-system-timezone.c 2012-06-18 00:08:12.000000000 +0200 +++ evolution-data-server-3.4.4/calendar/libecal/e-cal-system-timezone.c 2012-08-12 23:29:54.000000000 +0200 @@ -412,10 +412,10 @@ static gchar *last_timezone = NULL; static GStaticRecMutex mutex = G_STATIC_REC_MUTEX_INIT; - struct stat stat_localtime; - gchar *localtime_content = NULL; - gsize localtime_content_len = -1; - gchar *retval, *fallback = NULL; + struct stat stat_localtime; + gchar *localtime_content = NULL; + gsize localtime_content_len = -1; + gchar *retval, *fallback = NULL; if (g_stat (ETC_LOCALTIME, &stat_localtime) != 0) return NULL; @@ -478,13 +478,7 @@ typedef gchar * (*GetSystemTimezone) (GHashTable *ical_zones); /* The order of the functions here define the priority of the methods used * to find the timezone. First method has higher priority. */ -static GetSystemTimezone get_system_timezone_methods[] = { - /* cheap and "more correct" than data from a config file */ - system_timezone_read_etc_localtime_softlink, - /* reading /etc/timezone directly. Expensive since we have to stat - * many files, but it returns always correct values, even on KDE */ - system_timezone_read_etc_localtime_content, - system_timezone_read_etc_localtime_hardlink, +static GetSystemTimezone get_system_timezone_methods_config[] = { /* reading various config files */ system_timezone_read_etc_timezone, system_timezone_read_etc_sysconfig_clock, @@ -496,6 +490,14 @@ NULL }; +static GetSystemTimezone get_system_timezone_methods_slow[] = { + /* reading /etc/timezone directly. Expensive since we have to stat + * many files, but it returns always correct values, even on KDE */ + system_timezone_read_etc_localtime_content, + system_timezone_read_etc_localtime_hardlink, + NULL +}; + static gboolean system_timezone_is_valid (const gchar *tz, GHashTable *ical_zones) @@ -523,7 +525,7 @@ GHashTable *ical_zones; icalarray *builtin_timezones; gint ii; - gchar *tz; + gchar *tz, *config_tz = NULL; /* return only timezones known to libical */ ical_zones = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, NULL); @@ -543,11 +545,75 @@ g_hash_table_insert (ical_zones, g_strdup (location), GINT_TO_POINTER (1)); } - for (ii = 0; get_system_timezone_methods[ii] != NULL; ii++) { - tz = get_system_timezone_methods[ii] (ical_zones); + /* softlink is the best option, it points to the correct file */ + tz = system_timezone_read_etc_localtime_softlink (ical_zones); + if (system_timezone_is_valid (tz, ical_zones)) { + g_hash_table_destroy (ical_zones); + return tz; + } + + g_free (tz); + + config_tz = NULL; + + /* read correct timezone name from config file; checking + on /etc/localtime content can pick wrong timezone name, + even the file is same + */ + for (ii = 0; get_system_timezone_methods_config[ii] != NULL; ii++) { + config_tz = get_system_timezone_methods_config[ii] (ical_zones); + + if (system_timezone_is_valid (config_tz, ical_zones)) { + break; + } + + g_free (config_tz); + config_tz = NULL; + } + + if (config_tz) { + struct stat stat_localtime; + gchar *localtime_content = NULL; + gsize localtime_content_len = -1; + + if (g_stat (ETC_LOCALTIME, &stat_localtime) == 0 && + S_ISREG (stat_localtime.st_mode) && + g_file_get_contents (ETC_LOCALTIME, + &localtime_content, + &localtime_content_len, + NULL)) { + struct stat stat_config_tz; + gchar *filename = g_build_filename (SYSTEM_ZONEINFODIR, config_tz, NULL); + + if (filename && + g_stat (filename, &stat_config_tz) == 0 && + files_are_identical_content (&stat_localtime, + &stat_config_tz, + localtime_content, + localtime_content_len, + filename)) { + g_free (filename); + g_free (localtime_content); + g_hash_table_destroy (ical_zones); + + /* corresponding file name to config_tz matches /etc/localtime, + thus that's the correct one - return it as system timezone; + bonus is that it might match configured system timezone name too + */ + return config_tz; + } + g_free (filename); + } + + g_free (localtime_content); + } + + for (ii = 0; get_system_timezone_methods_slow[ii] != NULL; ii++) { + tz = get_system_timezone_methods_slow[ii] (ical_zones); if (system_timezone_is_valid (tz, ical_zones)) { g_hash_table_destroy (ical_zones); + g_free (config_tz); return tz; } @@ -556,7 +622,7 @@ g_hash_table_destroy (ical_zones); - return NULL; + return config_tz; } #else /* G_OS_WIN32 */ diff -Nru evolution-data-server-3.4.3/calendar/libecal/Makefile.in evolution-data-server-3.4.4/calendar/libecal/Makefile.in --- evolution-data-server-3.4.3/calendar/libecal/Makefile.in 2012-06-18 00:11:01.000000000 +0200 +++ evolution-data-server-3.4.4/calendar/libecal/Makefile.in 2012-08-12 23:32:24.000000000 +0200 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.5 from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, diff -Nru evolution-data-server-3.4.3/calendar/libedata-cal/Makefile.in evolution-data-server-3.4.4/calendar/libedata-cal/Makefile.in --- evolution-data-server-3.4.3/calendar/libedata-cal/Makefile.in 2012-06-18 00:11:02.000000000 +0200 +++ evolution-data-server-3.4.4/calendar/libedata-cal/Makefile.in 2012-08-12 23:32:25.000000000 +0200 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.5 from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, diff -Nru evolution-data-server-3.4.3/calendar/libegdbus/Makefile.in evolution-data-server-3.4.4/calendar/libegdbus/Makefile.in --- evolution-data-server-3.4.3/calendar/libegdbus/Makefile.in 2012-06-18 00:11:02.000000000 +0200 +++ evolution-data-server-3.4.4/calendar/libegdbus/Makefile.in 2012-08-12 23:32:25.000000000 +0200 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.5 from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, diff -Nru evolution-data-server-3.4.3/calendar/Makefile.in evolution-data-server-3.4.4/calendar/Makefile.in --- evolution-data-server-3.4.3/calendar/Makefile.in 2012-06-18 00:10:58.000000000 +0200 +++ evolution-data-server-3.4.4/calendar/Makefile.in 2012-08-12 23:32:21.000000000 +0200 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.5 from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, diff -Nru evolution-data-server-3.4.3/camel/camel-filter-driver.c evolution-data-server-3.4.4/camel/camel-filter-driver.c --- evolution-data-server-3.4.3/camel/camel-filter-driver.c 2012-06-18 00:08:13.000000000 +0200 +++ evolution-data-server-3.4.4/camel/camel-filter-driver.c 2012-08-12 23:29:54.000000000 +0200 @@ -1654,6 +1654,16 @@ if (message != NULL && camel_mime_message_get_source (message) == NULL) camel_mime_message_set_source (message, original_store_uid); + if (g_strcmp0 (store_uid, "local") == 0 || + g_strcmp0 (store_uid, "vfolder") == 0) { + store_uid = NULL; + } + + if (g_strcmp0 (original_store_uid, "local") == 0 || + g_strcmp0 (original_store_uid, "vfolder") == 0) { + original_store_uid = NULL; + } + list = g_queue_peek_head_link (&driver->priv->rules); result = CAMEL_SEARCH_NOMATCH; diff -Nru evolution-data-server-3.4.3/camel/camel-folder-summary.c evolution-data-server-3.4.4/camel/camel-folder-summary.c --- evolution-data-server-3.4.3/camel/camel-folder-summary.c 2012-06-18 00:09:39.000000000 +0200 +++ evolution-data-server-3.4.4/camel/camel-folder-summary.c 2012-08-12 23:29:54.000000000 +0200 @@ -167,6 +167,37 @@ G_DEFINE_TYPE (CamelFolderSummary, camel_folder_summary, CAMEL_TYPE_OBJECT) +static gboolean +remove_each_item (gpointer uid, + gpointer mi, + gpointer user_data) +{ + GSList **to_remove_infos = user_data; + + *to_remove_infos = g_slist_prepend (*to_remove_infos, mi); + + return TRUE; +} + +static void +remove_all_loaded (CamelFolderSummary *summary) +{ + GSList *to_remove_infos = NULL; + + g_return_if_fail (CAMEL_IS_FOLDER_SUMMARY (summary)); + + camel_folder_summary_lock (summary, CAMEL_FOLDER_SUMMARY_SUMMARY_LOCK); + + camel_folder_summary_lock (summary, CAMEL_FOLDER_SUMMARY_REF_LOCK); + g_hash_table_foreach_remove (summary->priv->loaded_infos, remove_each_item, &to_remove_infos); + camel_folder_summary_unlock (summary, CAMEL_FOLDER_SUMMARY_REF_LOCK); + + g_slist_foreach (to_remove_infos, (GFunc) camel_message_info_free, NULL); + g_slist_free (to_remove_infos); + + camel_folder_summary_unlock (summary, CAMEL_FOLDER_SUMMARY_SUMMARY_LOCK); +} + static void free_o_name (gpointer key, gpointer value, @@ -184,6 +215,8 @@ priv = CAMEL_FOLDER_SUMMARY_GET_PRIVATE (object); if (priv->timeout_handle) { + /* this should not happen, because the release timer + holds a reference on object */ g_source_remove (priv->timeout_handle); priv->timeout_handle = 0; } @@ -228,6 +261,11 @@ priv->index = NULL; } + if (priv->folder) { + g_object_weak_unref (G_OBJECT (priv->folder), (GWeakNotify) g_nullify_pointer, &priv->folder); + priv->folder = NULL; + } + /* Chain up to parent's dispose() method. */ G_OBJECT_CLASS (camel_folder_summary_parent_class)->dispose (object); } @@ -239,6 +277,7 @@ CamelFolderSummaryPrivate *priv = summary->priv; g_hash_table_destroy (priv->uids); + remove_all_loaded (summary); g_hash_table_destroy (priv->loaded_infos); g_hash_table_foreach (priv->filter_charset, free_o_name, NULL); @@ -265,6 +304,8 @@ /* folder can be NULL in certain cases, see maildir-store */ summary->priv->folder = folder; + if (folder) + g_object_weak_ref (G_OBJECT (folder), (GWeakNotify) g_nullify_pointer, &summary->priv->folder); } static void @@ -1961,6 +2002,8 @@ if (!summary->priv->folder || !g_hash_table_size (summary->priv->loaded_infos)) { summary->priv->cache_load_time = 0; summary->priv->timeout_handle = 0; + g_object_unref (summary); + return FALSE; } @@ -1993,8 +2036,10 @@ } /* FIXME[disk-summary] LRU please and not timeouts */ - if (can_do) - summary->priv->timeout_handle = g_timeout_add_seconds (SUMMARY_CACHE_DROP, (GSourceFunc) cfs_try_release_memory, summary); + if (can_do) { + summary->priv->timeout_handle = g_timeout_add_seconds (SUMMARY_CACHE_DROP, + (GSourceFunc) cfs_try_release_memory, g_object_ref (summary)); + } } /* update also cache load time to the actual, to not release something just loaded */ @@ -2223,6 +2268,7 @@ g_return_val_if_fail (CAMEL_IS_FOLDER_SUMMARY (summary), FALSE); + camel_folder_summary_lock (summary, CAMEL_FOLDER_SUMMARY_SUMMARY_LOCK); camel_folder_summary_save_to_db (summary, NULL); /* struct _db_pass_data data; */ @@ -2230,8 +2276,10 @@ full_name = camel_folder_get_full_name (summary->priv->folder); parent_store = camel_folder_get_parent_store (summary->priv->folder); - if (!camel_folder_summary_header_load_from_db (summary, parent_store, full_name, error)) + if (!camel_folder_summary_header_load_from_db (summary, parent_store, full_name, error)) { + camel_folder_summary_unlock (summary, CAMEL_FOLDER_SUMMARY_SUMMARY_LOCK); return FALSE; + } cdb = parent_store->cdb_r; @@ -2248,6 +2296,8 @@ } else if (local_error != NULL) g_propagate_error (error, local_error); + camel_folder_summary_unlock (summary, CAMEL_FOLDER_SUMMARY_SUMMARY_LOCK); + return ret == 0; } @@ -2577,28 +2627,30 @@ parent_store = camel_folder_get_parent_store (summary->priv->folder); cdb = parent_store->cdb_w; + camel_folder_summary_lock (summary, CAMEL_FOLDER_SUMMARY_SUMMARY_LOCK); + d(printf ("\ncamel_folder_summary_save_to_db called \n")); if (summary->priv->need_preview && g_hash_table_size (summary->priv->preview_updates)) { - camel_folder_summary_lock (summary, CAMEL_FOLDER_SUMMARY_SUMMARY_LOCK); - camel_db_begin_transaction (parent_store->cdb_w, NULL); g_hash_table_foreach (summary->priv->preview_updates, (GHFunc) msg_save_preview, summary->priv->folder); g_hash_table_remove_all (summary->priv->preview_updates); camel_db_end_transaction (parent_store->cdb_w, NULL); - - camel_folder_summary_unlock (summary, CAMEL_FOLDER_SUMMARY_SUMMARY_LOCK); } summary->flags &= ~CAMEL_SUMMARY_DIRTY; count = cfs_count_dirty (summary); - if (!count) - return camel_folder_summary_header_save_to_db (summary, error); + if (!count) { + gboolean res = camel_folder_summary_header_save_to_db (summary, error); + camel_folder_summary_unlock (summary, CAMEL_FOLDER_SUMMARY_SUMMARY_LOCK); + return res; + } ret = save_message_infos_to_db (summary, FALSE, error); if (ret != 0) { /* Failed, so lets reset the flag */ summary->flags |= CAMEL_SUMMARY_DIRTY; + camel_folder_summary_unlock (summary, CAMEL_FOLDER_SUMMARY_SUMMARY_LOCK); return FALSE; } @@ -2619,6 +2671,7 @@ ret = save_message_infos_to_db (summary, FALSE, error); if (ret != 0) { summary->flags |= CAMEL_SUMMARY_DIRTY; + camel_folder_summary_unlock (summary, CAMEL_FOLDER_SUMMARY_SUMMARY_LOCK); return FALSE; } } @@ -2626,6 +2679,7 @@ record = CAMEL_FOLDER_SUMMARY_GET_CLASS (summary)->summary_header_to_db (summary, error); if (!record) { summary->flags |= CAMEL_SUMMARY_DIRTY; + camel_folder_summary_unlock (summary, CAMEL_FOLDER_SUMMARY_SUMMARY_LOCK); return FALSE; } @@ -2638,10 +2692,12 @@ if (ret != 0) { camel_db_abort_transaction (cdb, NULL); summary->flags |= CAMEL_SUMMARY_DIRTY; + camel_folder_summary_unlock (summary, CAMEL_FOLDER_SUMMARY_SUMMARY_LOCK); return FALSE; } camel_db_end_transaction (cdb, NULL); + camel_folder_summary_unlock (summary, CAMEL_FOLDER_SUMMARY_SUMMARY_LOCK); return ret == 0; } @@ -2662,11 +2718,13 @@ parent_store = camel_folder_get_parent_store (summary->priv->folder); cdb = parent_store->cdb_w; + camel_folder_summary_lock (summary, CAMEL_FOLDER_SUMMARY_SUMMARY_LOCK); d(printf ("\ncamel_folder_summary_header_save_to_db called \n")); record = CAMEL_FOLDER_SUMMARY_GET_CLASS (summary)->summary_header_to_db (summary, error); if (!record) { + camel_folder_summary_unlock (summary, CAMEL_FOLDER_SUMMARY_SUMMARY_LOCK); return FALSE; } @@ -2678,10 +2736,12 @@ if (ret != 0) { camel_db_abort_transaction (cdb, NULL); + camel_folder_summary_unlock (summary, CAMEL_FOLDER_SUMMARY_SUMMARY_LOCK); return FALSE; } camel_db_end_transaction (cdb, NULL); + camel_folder_summary_unlock (summary, CAMEL_FOLDER_SUMMARY_SUMMARY_LOCK); return ret == 0; } @@ -2703,6 +2763,7 @@ d(printf ("\ncamel_folder_summary_header_load_from_db called \n")); + camel_folder_summary_lock (summary, CAMEL_FOLDER_SUMMARY_SUMMARY_LOCK); camel_folder_summary_save_to_db (summary, NULL); cdb = store->cdb_r; @@ -2712,6 +2773,8 @@ ret = CAMEL_FOLDER_SUMMARY_GET_CLASS (summary)->summary_header_from_db (summary, record); + camel_folder_summary_unlock (summary, CAMEL_FOLDER_SUMMARY_SUMMARY_LOCK); + g_free (record->folder_name); g_free (record->bdata); g_free (record); @@ -3133,6 +3196,7 @@ } g_hash_table_remove_all (summary->priv->uids); + remove_all_loaded (summary); g_hash_table_remove_all (summary->priv->loaded_infos); summary->priv->saved_count = 0; @@ -3265,9 +3329,16 @@ gpointer ptr_uid = NULL, ptr_flags = NULL; if (g_hash_table_lookup_extended (summary->priv->uids, l->data, &ptr_uid, &ptr_flags)) { const gchar *uid_copy = camel_pstring_strdup (l->data); + CamelMessageInfo *mi; + folder_summary_update_counts_by_flags (summary, GPOINTER_TO_UINT (ptr_flags), TRUE); g_hash_table_remove (summary->priv->uids, uid_copy); + + mi = g_hash_table_lookup (summary->priv->loaded_infos, uid_copy); g_hash_table_remove (summary->priv->loaded_infos, uid_copy); + + if (mi) + camel_message_info_free (mi); camel_pstring_free (uid_copy); } } @@ -3348,6 +3419,8 @@ case CAMEL_MIME_PARSER_STATE_MULTIPART: ci = CAMEL_FOLDER_SUMMARY_GET_CLASS (summary)->content_info_new_from_header (summary, camel_mime_parser_headers_raw (mp)); if (ci) { + if (ci->type) + camel_content_type_unref (ci->type); ci->type = camel_mime_parser_content_type (mp); camel_content_type_ref (ci->type); } @@ -4399,6 +4472,7 @@ if (mi->summary->priv->build_content && ((CamelMessageInfoBase *) mi)->content) { camel_folder_summary_content_info_free (mi->summary, ((CamelMessageInfoBase *) mi)->content); + ((CamelMessageInfoBase *) mi)->content = NULL; } CAMEL_FOLDER_SUMMARY_GET_CLASS (mi->summary)->message_info_free (mi->summary, mi); diff -Nru evolution-data-server-3.4.3/camel/camel-tcp-stream-raw.c evolution-data-server-3.4.4/camel/camel-tcp-stream-raw.c --- evolution-data-server-3.4.3/camel/camel-tcp-stream-raw.c 2012-06-18 00:08:15.000000000 +0200 +++ evolution-data-server-3.4.4/camel/camel-tcp-stream-raw.c 2012-08-12 23:29:54.000000000 +0200 @@ -53,8 +53,8 @@ #define d(x) -#define IO_TIMEOUT (PR_TicksPerSecond() * 4 * 60) -#define CONNECT_TIMEOUT (PR_TicksPerSecond () * 4 * 60) +#define IO_TIMEOUT (PR_TicksPerSecond() * 1 * 60) +#define CONNECT_TIMEOUT (PR_TicksPerSecond () * 1 * 60) typedef struct _CamelTcpStreamRawPrivate { PRFileDesc *sockfd; @@ -329,7 +329,7 @@ PR_GetCurrentThread (), (GDestroyNotify) NULL); do { - bytes_read = PR_Read (fd, buffer, n); + bytes_read = PR_Recv (fd, buffer, n, 0, IO_TIMEOUT); } while (bytes_read == -1 && PR_GetError () == PR_IO_PENDING_ERROR); if (cancel_id > 0) @@ -377,9 +377,9 @@ do { do { - bytes_written = PR_Write ( + bytes_written = PR_Send ( fd, buffer + total_written, - size - total_written); + size - total_written, 0, IO_TIMEOUT); } while (bytes_written == -1 && PR_GetError () == PR_IO_PENDING_ERROR); if (bytes_written > 0) @@ -525,7 +525,7 @@ cancellable, G_CALLBACK (tcp_stream_cancelled), PR_GetCurrentThread (), (GDestroyNotify) NULL); - status = PR_Connect (fd, &netaddr, PR_INTERVAL_NO_TIMEOUT); + status = PR_Connect (fd, &netaddr, CONNECT_TIMEOUT); if (cancel_id > 0) g_cancellable_disconnect (cancellable, cancel_id); diff -Nru evolution-data-server-3.4.3/camel/camel-vee-folder.c evolution-data-server-3.4.4/camel/camel-vee-folder.c --- evolution-data-server-3.4.3/camel/camel-vee-folder.c 2012-06-18 00:08:15.000000000 +0200 +++ evolution-data-server-3.4.4/camel/camel-vee-folder.c 2012-08-12 23:29:54.000000000 +0200 @@ -183,8 +183,8 @@ *unm_added_l = g_list_prepend (*unm_added_l, (gpointer) camel_pstring_strdup (vuid)); - camel_folder_summary_remove_uid ( - CAMEL_FOLDER (folder_unmatched)->summary, vuid); + camel_folder_summary_remove ( + CAMEL_FOLDER (folder_unmatched)->summary, (CamelMessageInfo *) vinfo); camel_folder_free_message_info ( CAMEL_FOLDER (folder_unmatched), (CamelMessageInfo *) vinfo); @@ -220,7 +220,13 @@ if (use_db) *m_removed_l = g_list_prepend (*m_removed_l, (gpointer) camel_pstring_strdup (vuid)); - camel_folder_summary_remove_uid (folder->summary, vuid); + vinfo = (CamelVeeMessageInfo *) camel_folder_summary_peek_loaded (folder->summary, vuid); + if (vinfo) { + camel_folder_summary_remove (folder->summary, (CamelMessageInfo *) vinfo); + camel_message_info_free ((CamelMessageInfo *) vinfo); + } else { + camel_folder_summary_remove_uid (folder->summary, vuid); + } if ((vf->flags & CAMEL_STORE_FOLDER_PRIVATE) == 0 && !CAMEL_IS_VEE_FOLDER (sub) && folder_unmatched != NULL) { if (keep) { @@ -251,8 +257,8 @@ *unm_removed_l = g_list_prepend (*unm_removed_l, (gpointer) camel_pstring_strdup (vuid)); - camel_folder_summary_remove_uid ( - CAMEL_FOLDER (folder_unmatched)->summary, vuid); + camel_folder_summary_remove ( + CAMEL_FOLDER (folder_unmatched)->summary, (CamelMessageInfo *) vinfo); camel_folder_free_message_info ( CAMEL_FOLDER (folder_unmatched), (CamelMessageInfo *) vinfo); @@ -751,16 +757,16 @@ if (vee_folder_add_uid_test (u->folder_unmatched, u->source, uidin, u->hash)) camel_folder_change_info_add_uid (u->folder_unmatched->changes, uid); } else { - CamelVeeMessageInfo *mi = (CamelVeeMessageInfo *) camel_folder_summary_get (((CamelFolder *) u->folder_unmatched)->summary, uid); + CamelMessageInfo *mi = camel_folder_summary_get (((CamelFolder *) u->folder_unmatched)->summary, uid); if (mi) { if (u->message_uids != NULL) g_queue_push_tail (u->message_uids, g_strdup (uid)); - camel_folder_summary_remove_uid ( - ((CamelFolder *) u->folder_unmatched)->summary, uid); + camel_folder_summary_remove ( + ((CamelFolder *) u->folder_unmatched)->summary, mi); camel_folder_change_info_remove_uid ( u->folder_unmatched->changes, uid); - camel_message_info_free ((CamelMessageInfo *) mi); + camel_message_info_free (mi); } } } @@ -1449,12 +1455,14 @@ known_uids = camel_folder_summary_get_array (folder->summary); for (i = 0; known_uids && i < known_uids->len; i++) { CamelVeeMessageInfo *mi = (CamelVeeMessageInfo *) camel_folder_summary_get (folder->summary, g_ptr_array_index (known_uids, i)); - if (mi->old_flags & CAMEL_MESSAGE_DELETED) { - del = g_list_prepend (del, (gpointer) camel_pstring_strdup (((CamelMessageInfo *) mi)->uid)); - camel_folder_summary_remove_uid (folder->summary, ((CamelMessageInfo *) mi)->uid); + if (mi) { + if (mi->old_flags & CAMEL_MESSAGE_DELETED) { + del = g_list_prepend (del, (gpointer) camel_pstring_strdup (((CamelMessageInfo *) mi)->uid)); + camel_folder_summary_remove (folder->summary, (CamelMessageInfo *) mi); + } + camel_message_info_free (mi); } - camel_message_info_free (mi); } camel_folder_summary_free_array (known_uids); @@ -1592,7 +1600,7 @@ if (mi) { if (mi->orig_summary == ssummary) { camel_folder_change_info_remove_uid (folder_unmatched->changes, camel_message_info_uid (mi)); - camel_folder_summary_remove_uid (((CamelFolder *) folder_unmatched)->summary, camel_message_info_uid (mi)); + camel_folder_summary_remove (((CamelFolder *) folder_unmatched)->summary, (CamelMessageInfo *) mi); } camel_message_info_free ((CamelMessageInfo *) mi); } @@ -1611,7 +1619,7 @@ const gchar *uid = camel_message_info_uid (mi); camel_folder_change_info_remove_uid (vf->changes, uid); - camel_folder_summary_remove_uid (folder->summary, uid); + camel_folder_summary_remove (folder->summary, (CamelMessageInfo *) mi); if ((vf->flags & CAMEL_STORE_FOLDER_PRIVATE) == 0 && folder_unmatched != NULL) { if (still) { @@ -1803,7 +1811,7 @@ if (g_hash_table_lookup (matchhash, uid + 8) == NULL) { camel_folder_change_info_remove_uid (vee_folder->changes, camel_message_info_uid (mi)); - camel_folder_summary_remove_uid (folder->summary, uid); + camel_folder_summary_remove (folder->summary, (CamelMessageInfo *) mi); if (!CAMEL_IS_VEE_FOLDER (source) && unmatched_uids != NULL @@ -1868,7 +1876,13 @@ if (strncmp (uid, u.hash, 8) == 0) { if (g_hash_table_lookup (allhash, uid + 8) == NULL) { /* no longer exists at all, just remove it entirely */ - camel_folder_summary_remove_uid (((CamelFolder *) folder_unmatched)->summary, uid); + CamelMessageInfo *mi = camel_folder_summary_peek_loaded (((CamelFolder *) folder_unmatched)->summary, uid); + if (mi) { + camel_folder_summary_remove (((CamelFolder *) folder_unmatched)->summary, mi); + camel_message_info_free (mi); + } else { + camel_folder_summary_remove_uid (((CamelFolder *) folder_unmatched)->summary, uid); + } camel_folder_change_info_remove_uid (folder_unmatched->changes, uid); } else { g_hash_table_remove (allhash, uid + 8); diff -Nru evolution-data-server-3.4.3/camel/Makefile.in evolution-data-server-3.4.4/camel/Makefile.in --- evolution-data-server-3.4.3/camel/Makefile.in 2012-06-18 00:11:04.000000000 +0200 +++ evolution-data-server-3.4.4/camel/Makefile.in 2012-08-12 23:32:27.000000000 +0200 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.5 from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, diff -Nru evolution-data-server-3.4.3/camel/providers/imap/camel-imap-folder.c evolution-data-server-3.4.4/camel/providers/imap/camel-imap-folder.c --- evolution-data-server-3.4.3/camel/providers/imap/camel-imap-folder.c 2012-06-18 00:08:15.000000000 +0200 +++ evolution-data-server-3.4.4/camel/providers/imap/camel-imap-folder.c 2012-08-12 23:29:54.000000000 +0200 @@ -1442,6 +1442,7 @@ if (count1 != count2) { g_list_free (list2); + camel_message_info_free ((CamelMessageInfo *) info); close_range (); continue; } @@ -1453,6 +1454,7 @@ if (cmp) { g_list_free (list2); + camel_message_info_free ((CamelMessageInfo *) info); close_range (); continue; } @@ -1657,19 +1659,13 @@ /* deleted_uids is NULL when not using real trash */ folder_path = camel_imap_settings_dup_real_trash_path ( CAMEL_IMAP_SETTINGS (settings)); - if (folder_path != NULL) { + if (folder_path != NULL && *folder_path) { if ((folder->folder_flags & CAMEL_FOLDER_IS_TRASH) != 0) { /* syncing the trash, expunge deleted when found any */ real_trash = g_object_ref (folder); } else { real_trash = camel_store_get_trash_folder_sync ( parent_store, cancellable, NULL); - - if (folder_path == NULL && real_trash) { - /* failed to open real trash */ - g_object_unref (real_trash); - real_trash = NULL; - } } } g_free (folder_path); @@ -1680,7 +1676,7 @@ /* junked_uids is NULL when not using real junk */ folder_path = camel_imap_settings_dup_real_junk_path ( CAMEL_IMAP_SETTINGS (settings)); - if (folder_path != NULL) { + if (folder_path != NULL && *folder_path) { if ((folder->folder_flags & CAMEL_FOLDER_IS_JUNK) != 0) { /* syncing the junk, but cannot move * messages to itself, thus do nothing */ @@ -1688,12 +1684,6 @@ } else { real_junk = camel_store_get_junk_folder_sync ( parent_store, cancellable, NULL); - - if (folder_path == NULL && real_junk) { - /* failed to open real junk */ - g_object_unref (real_junk); - real_junk = NULL; - } } } g_free (folder_path); @@ -1736,6 +1726,8 @@ if (!camel_imap_store_connected (store, NULL)) { g_free (set); camel_message_info_free (info); + g_ptr_array_foreach (matches, (GFunc) camel_message_info_free, NULL); + g_ptr_array_free (matches, TRUE); break; } @@ -1805,10 +1797,7 @@ camel_folder_summary_touch (folder->summary); } - for (j = 0; j < matches->len; j++) { - info = matches->pdata[j]; - camel_message_info_free (&info->info); - } + g_ptr_array_foreach (matches, (GFunc) camel_message_info_free, NULL); g_ptr_array_free (matches, TRUE); /* We unlock here so that other threads can have a chance to grab the connect_lock */ @@ -1829,6 +1818,10 @@ g_object_unref (real_trash); if (real_junk) g_object_unref (real_junk); + + g_ptr_array_foreach (summary, (GFunc) camel_pstring_free, NULL); + g_ptr_array_free (summary, TRUE); + return FALSE; } @@ -1912,7 +1905,15 @@ changes = camel_folder_change_info_new (); for (i = 0; i < uids->len; i++) { - camel_folder_summary_remove_uid (folder->summary, uids->pdata[i]); + CamelMessageInfo *mi = camel_folder_summary_peek_loaded (folder->summary, uids->pdata[i]); + + if (mi) { + camel_folder_summary_remove (folder->summary, mi); + camel_message_info_free (mi); + } else { + camel_folder_summary_remove_uid (folder->summary, uids->pdata[i]); + } + camel_folder_change_info_remove_uid (changes, uids->pdata[i]); list = g_list_prepend (list, (gpointer) uids->pdata[i]); /* We intentionally don't remove it from the cache because @@ -2015,7 +2016,15 @@ changes = camel_folder_change_info_new (); for (i = 0; i < uids->len; i++) { - camel_folder_summary_remove_uid (folder->summary, uids->pdata[i]); + CamelMessageInfo *mi = camel_folder_summary_peek_loaded (folder->summary, uids->pdata[i]); + + if (mi) { + camel_folder_summary_remove (folder->summary, mi); + camel_message_info_free (mi); + } else { + camel_folder_summary_remove_uid (folder->summary, uids->pdata[i]); + } + camel_folder_change_info_remove_uid (changes, uids->pdata[i]); list = g_list_prepend (list, (gpointer) uids->pdata[i]); /* We intentionally don't remove it from the cache because @@ -4370,6 +4379,8 @@ known_uids = camel_folder_summary_get_array (folder->summary); camel_folder_sort_uids (folder, known_uids); for (i = 0; i < expunged->len; i++) { + CamelMessageInfo *mi; + id = g_array_index (expunged, int, i); uid = id - 1 + i >= 0 && id - 1 + i < known_uids->len ? g_ptr_array_index (known_uids, id - 1 + i) : NULL; if (uid == NULL) { @@ -4383,7 +4394,14 @@ CAMEL_IMAP_FOLDER_REC_LOCK (imap_folder, cache_lock); camel_imap_message_cache_remove (imap_folder->cache, uid); CAMEL_IMAP_FOLDER_REC_UNLOCK (imap_folder, cache_lock); - camel_folder_summary_remove_uid (folder->summary, uid); + + mi = camel_folder_summary_peek_loaded (folder->summary, uid); + if (mi) { + camel_folder_summary_remove (folder->summary, mi); + camel_message_info_free (mi); + } else { + camel_folder_summary_remove_uid (folder->summary, uid); + } } /* Delete all in one transaction */ diff -Nru evolution-data-server-3.4.3/camel/providers/imap/camel-imap-store.c evolution-data-server-3.4.4/camel/providers/imap/camel-imap-store.c --- evolution-data-server-3.4.3/camel/providers/imap/camel-imap-store.c 2012-06-18 00:08:15.000000000 +0200 +++ evolution-data-server-3.4.4/camel/providers/imap/camel-imap-store.c 2012-08-12 23:29:55.000000000 +0200 @@ -2209,6 +2209,8 @@ new_folder = camel_imap_folder_new (store, folder_name, folder_dir, error); g_free (folder_dir); if (new_folder) { + if (imap_store->current_folder) + g_object_unref (imap_store->current_folder); imap_store->current_folder = g_object_ref (new_folder); if (!camel_imap_folder_selected ( new_folder, response, cancellable, error)) { diff -Nru evolution-data-server-3.4.3/camel/providers/imap/Makefile.in evolution-data-server-3.4.4/camel/providers/imap/Makefile.in --- evolution-data-server-3.4.3/camel/providers/imap/Makefile.in 2012-06-18 00:11:04.000000000 +0200 +++ evolution-data-server-3.4.4/camel/providers/imap/Makefile.in 2012-08-12 23:32:28.000000000 +0200 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.5 from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, diff -Nru evolution-data-server-3.4.3/camel/providers/imapx/camel-imapx-conn-manager.c evolution-data-server-3.4.4/camel/providers/imapx/camel-imapx-conn-manager.c --- evolution-data-server-3.4.3/camel/providers/imapx/camel-imapx-conn-manager.c 2012-06-18 00:09:40.000000000 +0200 +++ evolution-data-server-3.4.4/camel/providers/imapx/camel-imapx-conn-manager.c 2012-08-12 23:29:55.000000000 +0200 @@ -294,7 +294,7 @@ link = g_list_find (list, cinfo); if (link != NULL) { - list = g_list_remove_link (list, link); + list = g_list_delete_link (list, link); connection_info_unref (cinfo); removed = TRUE; } diff -Nru evolution-data-server-3.4.3/camel/providers/imapx/camel-imapx-server.c evolution-data-server-3.4.4/camel/providers/imapx/camel-imapx-server.c --- evolution-data-server-3.4.3/camel/providers/imapx/camel-imapx-server.c 2012-06-18 00:09:40.000000000 +0200 +++ evolution-data-server-3.4.4/camel/providers/imapx/camel-imapx-server.c 2012-08-12 23:29:55.000000000 +0200 @@ -309,9 +309,29 @@ } static void +refresh_info_data_infos_free (RefreshInfoData *data) +{ + gint ii; + + if (!data || !data->infos) + return; + + for (ii = 0; ii < data->infos->len; ii++) { + struct _refresh_info *r = &g_array_index (data->infos, struct _refresh_info, ii); + + camel_flag_list_free (&r->server_user_flags); + g_free (r->uid); + } + + g_array_free (data->infos, TRUE); + data->infos = NULL; +} + +static void refresh_info_data_free (RefreshInfoData *data) { camel_folder_change_info_free (data->changes); + refresh_info_data_infos_free (data); g_slice_free (RefreshInfoData, data); } @@ -978,6 +998,7 @@ gboolean unsolicited) { CamelIMAPXFolder *ifolder = (CamelIMAPXFolder *) is->select_folder; + CamelMessageInfo *mi; if (unsolicited && ifolder->exists_on_server) ifolder->exists_on_server--; @@ -985,7 +1006,14 @@ if (is->changes == NULL) is->changes = camel_folder_change_info_new (); - camel_folder_summary_remove_uid (is->select_folder->summary, uid); + mi = camel_folder_summary_peek_loaded (is->select_folder->summary, uid); + if (mi) { + camel_folder_summary_remove (is->select_folder->summary, mi); + camel_message_info_free (mi); + } else { + camel_folder_summary_remove_uid (is->select_folder->summary, uid); + } + is->expunged = g_list_prepend (is->expunged, uid); camel_folder_change_info_remove_uid (is->changes, uid); @@ -1198,6 +1226,8 @@ CamelIMAPXStore *imapx_store = (CamelIMAPXStore *) is->store; CamelIMAPXStoreNamespace *ns; + if (imapx_store->summary->namespaces) + camel_imapx_namespace_list_clear (imapx_store->summary->namespaces); imapx_store->summary->namespaces = nsl; camel_store_summary_touch ((CamelStoreSummary *) imapx_store->summary); @@ -1444,6 +1474,8 @@ cnt = (camel_folder_summary_count (job->folder->summary) * 100 ) / ifolder->exists_on_server; camel_operation_progress (job->cancellable, cnt ? cnt : 1); + } else { + camel_message_info_free (mi); } if (free_user_flags && server_user_flags) @@ -3807,13 +3839,7 @@ isum->uidnext = ifolder->uidnext_on_server; cleanup: - for (i = 0; i < data->infos->len; i++) { - struct _refresh_info *r = &g_array_index (data->infos, struct _refresh_info, i); - - camel_flag_list_free (&r->server_user_flags); - g_free (r->uid); - } - g_array_free (data->infos, TRUE); + refresh_info_data_infos_free (data); imapx_unregister_job (is, job); camel_imapx_command_unref (ic); @@ -3856,7 +3882,6 @@ CamelSettings *settings; RefreshInfoData *data; guint uidset_size; - gint i; gboolean success = TRUE; gboolean mobile_mode; @@ -4012,12 +4037,7 @@ } } - for (i = 0; i < data->infos->len; i++) { - struct _refresh_info *r = &g_array_index (data->infos, struct _refresh_info, i); - - camel_flag_list_free (&r->server_user_flags); - g_free (r->uid); - } + refresh_info_data_infos_free (data); /* There's no sane way to get the server-side unseen count on the * select mailbox. So just work it out from the flags if its not in @@ -4027,7 +4047,6 @@ if (!mobile_mode) ((CamelIMAPXFolder *) job->folder)->unread_on_server = camel_folder_summary_get_unread_count (job->folder->summary); - g_array_free (data->infos, TRUE); imapx_unregister_job (is, job); camel_imapx_command_unref (ic); @@ -4074,6 +4093,7 @@ data->scan_changes = TRUE; ic->pri = job->pri; + refresh_info_data_infos_free (data); data->infos = g_array_new (0, 0, sizeof (struct _refresh_info)); imapx_command_queue (is, ic); g_free (uid); @@ -4215,6 +4235,7 @@ is, "FETCH", job->folder, "UID FETCH %s:* (UID FLAGS)", uid); imapx_uidset_init (&data->uidset, uidset_size, 0); + refresh_info_data_infos_free (data); data->infos = g_array_new (0, 0, sizeof (struct _refresh_info)); ic->pri = job->pri; @@ -4318,6 +4339,7 @@ "UID FETCH %s:* (UID FLAGS)", uid); imapx_uidset_init (&data->uidset, uidset_size, 0); + refresh_info_data_infos_free (data); data->infos = g_array_new (0, 0, sizeof (struct _refresh_info)); ic->pri = job->pri; @@ -4618,8 +4640,16 @@ changes = camel_folder_change_info_new (); for (i = 0; i < uids->len; i++) { gchar *uid = uids->pdata[i]; + CamelMessageInfo *mi; + + mi = camel_folder_summary_peek_loaded (folder->summary, uid); + if (mi) { + camel_folder_summary_remove (folder->summary, mi); + camel_message_info_free (mi); + } else { + camel_folder_summary_remove_uid (folder->summary, uid); + } - camel_folder_summary_remove_uid (folder->summary, uid); camel_folder_change_info_remove_uid (changes, uids->pdata[i]); removed = g_list_prepend (removed, (gpointer) uids->pdata[i]); } @@ -5454,6 +5484,14 @@ { CamelIMAPXServer *is = CAMEL_IMAPX_SERVER (object); + camel_imapx_command_queue_free (is->queue); + camel_imapx_command_queue_free (is->active); + camel_imapx_command_queue_free (is->done); + + is->queue = NULL; + is->active = NULL; + is->done = NULL; + g_static_rec_mutex_free (&is->queue_lock); g_static_rec_mutex_free (&is->ostream_lock); g_mutex_free (is->fetch_mutex); diff -Nru evolution-data-server-3.4.3/camel/providers/imapx/camel-imapx-store.c evolution-data-server-3.4.4/camel/providers/imapx/camel-imapx-store.c --- evolution-data-server-3.4.3/camel/providers/imapx/camel-imapx-store.c 2012-06-18 00:08:16.000000000 +0200 +++ evolution-data-server-3.4.4/camel/providers/imapx/camel-imapx-store.c 2012-08-12 23:29:55.000000000 +0200 @@ -985,12 +985,13 @@ ns = ns->next; } } - g_list_free (namespaces); out: + g_list_free (namespaces); g_object_unref (server); return folders; exception: + g_list_free (namespaces); g_object_unref (server); g_hash_table_destroy (folders); return NULL; diff -Nru evolution-data-server-3.4.3/camel/providers/imapx/Makefile.in evolution-data-server-3.4.4/camel/providers/imapx/Makefile.in --- evolution-data-server-3.4.3/camel/providers/imapx/Makefile.in 2012-06-18 00:11:05.000000000 +0200 +++ evolution-data-server-3.4.4/camel/providers/imapx/Makefile.in 2012-08-12 23:32:29.000000000 +0200 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.5 from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, diff -Nru evolution-data-server-3.4.3/camel/providers/local/camel-maildir-folder.c evolution-data-server-3.4.4/camel/providers/local/camel-maildir-folder.c --- evolution-data-server-3.4.3/camel/providers/local/camel-maildir-folder.c 2012-06-18 00:09:40.000000000 +0200 +++ evolution-data-server-3.4.4/camel/providers/local/camel-maildir-folder.c 2012-08-12 23:29:55.000000000 +0200 @@ -219,8 +219,7 @@ fail_write: /* remove the summary info so we are not out-of-sync with the mh folder */ - camel_folder_summary_remove_uid (CAMEL_FOLDER_SUMMARY (folder->summary), - camel_message_info_uid (mi)); + camel_folder_summary_remove (CAMEL_FOLDER_SUMMARY (folder->summary), mi); g_prefix_error ( error, _("Cannot append message to maildir folder: %s: "), diff -Nru evolution-data-server-3.4.3/camel/providers/local/camel-mbox-folder.c evolution-data-server-3.4.4/camel/providers/local/camel-mbox-folder.c --- evolution-data-server-3.4.3/camel/providers/local/camel-mbox-folder.c 2012-06-18 00:08:16.000000000 +0200 +++ evolution-data-server-3.4.4/camel/providers/local/camel-mbox-folder.c 2012-08-12 23:29:55.000000000 +0200 @@ -272,7 +272,7 @@ g_free (fromline); /* remove the summary info so we are not out-of-sync with the mbox */ - camel_folder_summary_remove_uid (CAMEL_FOLDER_SUMMARY (mbs), camel_message_info_uid (mi)); + camel_folder_summary_remove (CAMEL_FOLDER_SUMMARY (mbs), mi); /* and tell the summary it's up-to-date */ if (g_stat (lf->folder_path, &st) == 0) { diff -Nru evolution-data-server-3.4.3/camel/providers/local/camel-mbox-store.c evolution-data-server-3.4.4/camel/providers/local/camel-mbox-store.c --- evolution-data-server-3.4.3/camel/providers/local/camel-mbox-store.c 2012-06-18 00:08:16.000000000 +0200 +++ evolution-data-server-3.4.4/camel/providers/local/camel-mbox-store.c 2012-08-12 23:29:55.000000000 +0200 @@ -904,10 +904,9 @@ CamelLocalSettings *local_settings; CamelSettings *settings; CamelService *service; - const gchar *inptr = full_name; - gint subdirs = 0; + GString *full_path; gchar *root_path; - gchar *path, *p; + const gchar *cp; service = CAMEL_SERVICE (ls); settings = camel_service_get_settings (service); @@ -916,35 +915,29 @@ root_path = camel_local_settings_dup_path (local_settings); g_return_val_if_fail (root_path != NULL, NULL); - while (*inptr != '\0') { - if (G_IS_DIR_SEPARATOR (*inptr)) - subdirs++; - inptr++; - } - - path = g_malloc (strlen (root_path) + (inptr - full_name) + (4 * subdirs) + 1); - p = g_stpcpy (path, root_path); + full_path = g_string_new (root_path); - g_free (root_path); - - inptr = full_name; - while (*inptr != '\0') { - while (!G_IS_DIR_SEPARATOR (*inptr) && *inptr != '\0') - *p++ = *inptr++; - - if (G_IS_DIR_SEPARATOR (*inptr)) { - p = g_stpcpy (p, ".sbd/"); - inptr++; - - /* strip extranaeous '/'s */ - while (G_IS_DIR_SEPARATOR (*inptr)) - inptr++; + /* Root path may or may not have a trailing separator. */ + if (!g_str_has_suffix (root_path, G_DIR_SEPARATOR_S)) + g_string_append_c (full_path, G_DIR_SEPARATOR); + + cp = full_name; + while (*cp != '\0') { + if (G_IS_DIR_SEPARATOR (*cp)) { + g_string_append (full_path, ".sbd"); + g_string_append_c (full_path, *cp++); + + /* Skip extranaeous separators. */ + while (G_IS_DIR_SEPARATOR (*cp)) + cp++; + } else { + g_string_append_c (full_path, *cp++); } } - *p = '\0'; + g_free (root_path); - return path; + return g_string_free (full_path, FALSE); } static gchar * diff -Nru evolution-data-server-3.4.3/camel/providers/local/camel-mbox-summary.c evolution-data-server-3.4.4/camel/providers/local/camel-mbox-summary.c --- evolution-data-server-3.4.3/camel/providers/local/camel-mbox-summary.c 2012-06-18 00:08:16.000000000 +0200 +++ evolution-data-server-3.4.4/camel/providers/local/camel-mbox-summary.c 2012-08-12 23:29:55.000000000 +0200 @@ -514,7 +514,8 @@ if (changeinfo) camel_folder_change_info_remove_uid (changeinfo, uid); del = g_list_prepend (del, (gpointer) camel_pstring_strdup (uid)); - camel_folder_summary_remove_uid (s, uid); + if (mi) + camel_folder_summary_remove (s, (CamelMessageInfo *) mi); } if (mi) @@ -1135,7 +1136,7 @@ /* remove it from the change list */ camel_folder_change_info_remove_uid (changeinfo, uid); - camel_folder_summary_remove_uid (s, uid); + camel_folder_summary_remove (s, (CamelMessageInfo *) info); del = g_list_prepend (del, (gpointer) camel_pstring_strdup (uid)); camel_message_info_free ((CamelMessageInfo *) info); info = NULL; diff -Nru evolution-data-server-3.4.3/camel/providers/local/camel-mh-folder.c evolution-data-server-3.4.4/camel/providers/local/camel-mh-folder.c --- evolution-data-server-3.4.3/camel/providers/local/camel-mh-folder.c 2012-06-18 00:08:16.000000000 +0200 +++ evolution-data-server-3.4.4/camel/providers/local/camel-mh-folder.c 2012-08-12 23:29:55.000000000 +0200 @@ -112,8 +112,7 @@ fail_write: /* remove the summary info so we are not out-of-sync with the mh folder */ - camel_folder_summary_remove_uid (CAMEL_FOLDER_SUMMARY (folder->summary), - camel_message_info_uid (mi)); + camel_folder_summary_remove (CAMEL_FOLDER_SUMMARY (folder->summary), mi); g_prefix_error ( error, _("Cannot append message to mh folder: %s: "), name); diff -Nru evolution-data-server-3.4.3/camel/providers/local/camel-spool-summary.c evolution-data-server-3.4.4/camel/providers/local/camel-spool-summary.c --- evolution-data-server-3.4.3/camel/providers/local/camel-spool-summary.c 2012-06-18 00:08:16.000000000 +0200 +++ evolution-data-server-3.4.4/camel/providers/local/camel-spool-summary.c 2012-08-12 23:29:55.000000000 +0200 @@ -105,7 +105,9 @@ gint forceindex, GError **error) { - g_warning("spool summary - not loading anything\n"); + /* if not loading, then rescan mbox file content */ + camel_local_summary_check_force (cls); + return 0; } diff -Nru evolution-data-server-3.4.3/camel/providers/local/Makefile.in evolution-data-server-3.4.4/camel/providers/local/Makefile.in --- evolution-data-server-3.4.3/camel/providers/local/Makefile.in 2012-06-18 00:11:05.000000000 +0200 +++ evolution-data-server-3.4.4/camel/providers/local/Makefile.in 2012-08-12 23:32:29.000000000 +0200 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.5 from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, diff -Nru evolution-data-server-3.4.3/camel/providers/Makefile.in evolution-data-server-3.4.4/camel/providers/Makefile.in --- evolution-data-server-3.4.3/camel/providers/Makefile.in 2012-06-18 00:11:04.000000000 +0200 +++ evolution-data-server-3.4.4/camel/providers/Makefile.in 2012-08-12 23:32:27.000000000 +0200 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.5 from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, diff -Nru evolution-data-server-3.4.3/camel/providers/nntp/camel-nntp-folder.c evolution-data-server-3.4.4/camel/providers/nntp/camel-nntp-folder.c --- evolution-data-server-3.4.3/camel/providers/nntp/camel-nntp-folder.c 2012-06-18 00:08:16.000000000 +0200 +++ evolution-data-server-3.4.4/camel/providers/nntp/camel-nntp-folder.c 2012-08-12 23:29:55.000000000 +0200 @@ -701,7 +701,14 @@ changes = camel_folder_change_info_new (); for (ii = 0; ii < uids->len; ii++) { - camel_folder_summary_remove_uid (folder->summary, uids->pdata[ii]); + CamelMessageInfo *mi = camel_folder_summary_peek_loaded (folder->summary, uids->pdata[ii]); + if (mi) { + camel_folder_summary_remove (folder->summary, mi); + camel_message_info_free (mi); + } else { + camel_folder_summary_remove_uid (folder->summary, uids->pdata[ii]); + } + camel_folder_change_info_remove_uid (changes, uids->pdata[ii]); } diff -Nru evolution-data-server-3.4.3/camel/providers/nntp/camel-nntp-summary.c evolution-data-server-3.4.4/camel/providers/nntp/camel-nntp-summary.c --- evolution-data-server-3.4.3/camel/providers/nntp/camel-nntp-summary.c 2012-06-18 00:08:16.000000000 +0200 +++ evolution-data-server-3.4.4/camel/providers/nntp/camel-nntp-summary.c 2012-08-12 23:29:55.000000000 +0200 @@ -462,6 +462,8 @@ n = strtoul (uid, NULL, 10); if (n < f || n > l) { + CamelMessageInfo *mi; + dd (printf ("nntp_summary: %u is lower/higher than lowest/highest article, removed\n", n)); /* Since we use a global cache this could prematurely remove * a cached message that might be in another folder - not that important as @@ -471,7 +473,14 @@ camel_data_cache_remove (store->cache, "cache", msgid + 1, NULL); camel_folder_change_info_remove_uid (changes, uid); del = g_list_prepend (del, (gpointer) camel_pstring_strdup (uid)); - camel_folder_summary_remove_uid (s, uid); + + mi = camel_folder_summary_peek_loaded (s, uid); + if (mi) { + camel_folder_summary_remove (s, mi); + camel_message_info_free (mi); + } else { + camel_folder_summary_remove_uid (s, uid); + } } } camel_folder_summary_free_array (known_uids); diff -Nru evolution-data-server-3.4.3/camel/providers/nntp/Makefile.in evolution-data-server-3.4.4/camel/providers/nntp/Makefile.in --- evolution-data-server-3.4.3/camel/providers/nntp/Makefile.in 2012-06-18 00:11:06.000000000 +0200 +++ evolution-data-server-3.4.4/camel/providers/nntp/Makefile.in 2012-08-12 23:32:30.000000000 +0200 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.5 from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, diff -Nru evolution-data-server-3.4.3/camel/providers/pop3/Makefile.in evolution-data-server-3.4.4/camel/providers/pop3/Makefile.in --- evolution-data-server-3.4.3/camel/providers/pop3/Makefile.in 2012-06-18 00:11:06.000000000 +0200 +++ evolution-data-server-3.4.4/camel/providers/pop3/Makefile.in 2012-08-12 23:32:30.000000000 +0200 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.5 from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, diff -Nru evolution-data-server-3.4.3/camel/providers/sendmail/Makefile.in evolution-data-server-3.4.4/camel/providers/sendmail/Makefile.in --- evolution-data-server-3.4.3/camel/providers/sendmail/Makefile.in 2012-06-18 00:11:07.000000000 +0200 +++ evolution-data-server-3.4.4/camel/providers/sendmail/Makefile.in 2012-08-12 23:32:31.000000000 +0200 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.5 from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, diff -Nru evolution-data-server-3.4.3/camel/providers/smtp/camel-smtp-transport.c evolution-data-server-3.4.4/camel/providers/smtp/camel-smtp-transport.c --- evolution-data-server-3.4.3/camel/providers/smtp/camel-smtp-transport.c 2012-06-18 00:09:40.000000000 +0200 +++ evolution-data-server-3.4.4/camel/providers/smtp/camel-smtp-transport.c 2012-08-12 23:29:55.000000000 +0200 @@ -856,8 +856,14 @@ const guchar *start, *end; GHashTable *table = NULL; - /* advance to the first token */ start = buffer; + + /* make sure there is at least one delimiter + character in the AUTH response */ + if (!isspace ((gint) *start) && *start != '=') + return NULL; + + /* advance to the first token */ while (isspace ((gint) *start) || *start == '=') start++; @@ -1180,7 +1186,7 @@ transport->flags &= ~CAMEL_SMTP_TRANSPORT_AUTH_EQUAL; /* parse for supported AUTH types */ - token += 5; + token += 4; if (transport->authtypes) { g_hash_table_foreach (transport->authtypes, authtypes_free, NULL); diff -Nru evolution-data-server-3.4.3/camel/providers/smtp/Makefile.in evolution-data-server-3.4.4/camel/providers/smtp/Makefile.in --- evolution-data-server-3.4.3/camel/providers/smtp/Makefile.in 2012-06-18 00:11:07.000000000 +0200 +++ evolution-data-server-3.4.4/camel/providers/smtp/Makefile.in 2012-08-12 23:32:31.000000000 +0200 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.5 from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, diff -Nru evolution-data-server-3.4.3/camel/tests/folder/Makefile.in evolution-data-server-3.4.4/camel/tests/folder/Makefile.in --- evolution-data-server-3.4.3/camel/tests/folder/Makefile.in 2012-06-18 00:11:08.000000000 +0200 +++ evolution-data-server-3.4.4/camel/tests/folder/Makefile.in 2012-08-12 23:32:32.000000000 +0200 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.5 from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, diff -Nru evolution-data-server-3.4.3/camel/tests/lib/Makefile.in evolution-data-server-3.4.4/camel/tests/lib/Makefile.in --- evolution-data-server-3.4.3/camel/tests/lib/Makefile.in 2012-06-18 00:11:08.000000000 +0200 +++ evolution-data-server-3.4.4/camel/tests/lib/Makefile.in 2012-08-12 23:32:32.000000000 +0200 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.5 from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, diff -Nru evolution-data-server-3.4.3/camel/tests/Makefile.in evolution-data-server-3.4.4/camel/tests/Makefile.in --- evolution-data-server-3.4.3/camel/tests/Makefile.in 2012-06-18 00:11:07.000000000 +0200 +++ evolution-data-server-3.4.4/camel/tests/Makefile.in 2012-08-12 23:32:31.000000000 +0200 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.5 from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, diff -Nru evolution-data-server-3.4.3/camel/tests/message/Makefile.in evolution-data-server-3.4.4/camel/tests/message/Makefile.in --- evolution-data-server-3.4.3/camel/tests/message/Makefile.in 2012-06-18 00:11:09.000000000 +0200 +++ evolution-data-server-3.4.4/camel/tests/message/Makefile.in 2012-08-12 23:32:33.000000000 +0200 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.5 from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, diff -Nru evolution-data-server-3.4.3/camel/tests/mime-filter/Makefile.in evolution-data-server-3.4.4/camel/tests/mime-filter/Makefile.in --- evolution-data-server-3.4.3/camel/tests/mime-filter/Makefile.in 2012-06-18 00:11:09.000000000 +0200 +++ evolution-data-server-3.4.4/camel/tests/mime-filter/Makefile.in 2012-08-12 23:32:33.000000000 +0200 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.5 from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, diff -Nru evolution-data-server-3.4.3/camel/tests/misc/Makefile.in evolution-data-server-3.4.4/camel/tests/misc/Makefile.in --- evolution-data-server-3.4.3/camel/tests/misc/Makefile.in 2012-06-18 00:11:10.000000000 +0200 +++ evolution-data-server-3.4.4/camel/tests/misc/Makefile.in 2012-08-12 23:32:34.000000000 +0200 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.5 from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, diff -Nru evolution-data-server-3.4.3/camel/tests/smime/Makefile.in evolution-data-server-3.4.4/camel/tests/smime/Makefile.in --- evolution-data-server-3.4.3/camel/tests/smime/Makefile.in 2012-06-18 00:11:10.000000000 +0200 +++ evolution-data-server-3.4.4/camel/tests/smime/Makefile.in 2012-08-12 23:32:34.000000000 +0200 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.5 from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, diff -Nru evolution-data-server-3.4.3/ChangeLog evolution-data-server-3.4.4/ChangeLog --- evolution-data-server-3.4.3/ChangeLog 2012-06-18 00:52:00.000000000 +0200 +++ evolution-data-server-3.4.4/ChangeLog 2012-08-13 01:34:23.000000000 +0200 @@ -1,10 +1,233 @@ # Generated by Makefile. Do not edit. -commit 305cbdb6c0e4c822b8755442b9d286eebf88c44b +commit 758371620ef8efef4c2f30902dae55caae17a1f9 +Author: Matthew Barnes +Date: Sun Aug 12 19:33:18 2012 -0400 + + NEWS update for 3.4.4 release. + + NEWS | 19 +++++++++++++++++++ + 1 file changed, 19 insertions(+) + +commit f889fe3188b61e272effd7ca44c101652fa81c20 +Author: Matthew Barnes +Date: Sun Aug 12 17:51:07 2012 -0400 + + API documentation tweaks. + + docs/reference/libebackend/libebackend-docs.xml | 2 +- + docs/reference/libedataserverui/libedataserverui-docs.sgml | 1 - + 2 files changed, 1 insertion(+), 2 deletions(-) + +commit 1027ad3ff9e4d2884b6b49b0c821b06af24ecc00 +Author: Matthew Barnes +Date: Fri Aug 10 07:34:19 2012 -0400 + + mbox_store_get_full_path(): Improve path building. + + Deal with the root path not ending in a directory separator, and use a + GString for heaven sake! + + (cherry picked from commit 0a9a5edcc872a75af97345e4137e98f2bceabdab) + + camel/providers/local/camel-mbox-store.c | 43 +++++++++++++----------------- + 1 file changed, 18 insertions(+), 25 deletions(-) + +commit e5f62323b54210d7ad21979b989ddabf87cf35cf +Author: Milan Crha +Date: Thu Aug 9 13:26:25 2012 +0200 + + Bug #679488 - Unable to send mail using SMTP + + camel/providers/smtp/camel-smtp-transport.c | 10 ++++++++-- + 1 file changed, 8 insertions(+), 2 deletions(-) + +commit 71d7c90d68b0d94c536eee6811e5a954b3250811 +Author: Dan Vrátil +Date: Thu Aug 9 13:19:34 2012 +0200 + + Fix a memory leak in e-cal-system-timezone.c + + calendar/libecal/e-cal-system-timezone.c | 1 + + 1 file changed, 1 insertion(+) + +commit b655a9f780caeb4fd4077b694a0c5ff32308e60b +Author: Milan Crha +Date: Tue Aug 7 18:16:04 2012 +0200 + + Bug #681318 - Filter by Source account doesn't match in local folders + + camel/camel-filter-driver.c | 10 ++++++++++ + 1 file changed, 10 insertions(+) + +commit c9a8627fb9a9f1d1086527f5823c9e757f5e0147 +Author: Milan Crha +Date: Fri Jul 27 12:37:20 2012 +0200 + + GN-bug #680687 - System timezone name differs from set in Gnome + + calendar/libecal/e-cal-system-timezone.c | 95 +++++++++++++++++++++++++----- + 1 file changed, 80 insertions(+), 15 deletions(-) + +commit f746a81cc4cb5f6e3c044e5fd7fc2d286d7b49c8 +Author: Milan Crha +Date: Wed Jul 25 13:15:05 2012 +0200 + + Bug #674696 - Crash from finish_operation, get_groups_cb in Google backend + + addressbook/backends/google/e-book-backend-google.c | 3 +++ + 1 file changed, 3 insertions(+) + +commit d56ed59471926a2b4117894bb4a444a6221e78a8 +Author: Milan Crha +Date: Tue Jul 24 09:07:20 2012 +0200 + + Bug #680502 - Deadlock in contacts backend + + .../backends/contacts/e-cal-backend-contacts.c | 44 ++++++++++---------- + 1 file changed, 22 insertions(+), 22 deletions(-) + +commit 6cfd76b0b2545306662b669b0535253a30a24304 +Author: Milan Crha +Date: Fri Jul 20 18:05:05 2012 +0200 + + Bug #680211 - Memory usage increases on each folder select + + camel/camel-folder-summary.c | 51 ++++++++++++++++++++++++++++-- + camel/providers/imap/camel-imap-folder.c | 29 +++++++---------- + camel/providers/imap/camel-imap-store.c | 2 ++ + 3 files changed, 62 insertions(+), 20 deletions(-) + +commit b437af542407a8f1b6c3aef5f0ac1625b4f44a23 +Author: Milan Crha +Date: Fri Jul 20 08:11:00 2012 +0200 + + Prefer camel_folder_summary_peek_loaded() when removing CamelMessageInfo + + camel/providers/imapx/camel-imapx-server.c | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) + +commit b5c292e139e2403c3149ea6837a480b18ca3f9fb +Author: Milan Crha +Date: Thu Jul 19 22:33:46 2012 +0200 + + Make sure loaded info is also freed before using camel_folder_summary_remove_uid() + + The problem is that camel_folder_summary_remove_uid() doesn't free loaded + CamelMessageInfo, if there is any, it does only camel_folder_summary_remove(), + thus this might be done on each place, unfortunately. + + camel/camel-vee-folder.c | 48 +++++++++++++++++--------- + camel/providers/imap/camel-imap-folder.c | 31 +++++++++++++++-- + camel/providers/local/camel-maildir-folder.c | 3 +- + camel/providers/local/camel-mbox-folder.c | 2 +- + camel/providers/local/camel-mbox-summary.c | 5 +-- + camel/providers/local/camel-mh-folder.c | 3 +- + camel/providers/nntp/camel-nntp-folder.c | 9 ++++- + camel/providers/nntp/camel-nntp-summary.c | 11 +++++- + 8 files changed, 83 insertions(+), 29 deletions(-) + +commit d7d9ce00adedcef1ed3024a043cbfce314ee9547 +Author: Milan Crha +Date: Thu Jul 19 22:11:32 2012 +0200 + + Bug #677530 - Memory leaks in imapx code + + camel/camel-folder-summary.c | 9 +++ + camel/providers/imapx/camel-imapx-conn-manager.c | 2 +- + camel/providers/imapx/camel-imapx-server.c | 68 ++++++++++++++++------ + camel/providers/imapx/camel-imapx-store.c | 3 +- + 4 files changed, 63 insertions(+), 19 deletions(-) + +commit 6aa237c1b68bbc001d4346f298ff711cae9051fc +Author: Milan Crha +Date: Wed Jul 18 18:45:49 2012 +0200 + + Bug #679017 - Broken spool mbox file accounts + + camel/providers/local/camel-spool-summary.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +commit 354eec6abb5d489b33d1ba3f811bea188fb44375 +Author: Milan Crha +Date: Wed Jul 18 18:36:22 2012 +0200 + + Fix build break from the previous commit + + camel/camel-folder-summary.c | 28 +++++++++++++--------------- + 1 file changed, 13 insertions(+), 15 deletions(-) + +commit a511ec39a3c3df5e359385b77b01b9e8d4e6b420 +Author: Milan Crha +Date: Tue Jul 17 14:35:32 2012 +0200 + + Bug #551788 - Hangs when network changes + + camel/camel-tcp-stream-raw.c | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) + +commit 5819cde4f10283cdd67a2851ebce457238fcaff4 +Author: Matthew Barnes +Date: Sat Jul 14 08:37:14 2012 -0400 + + Bug 559391 - Wrong number of unread mails in folder tree + + This reverts part of the original fix for this bug which stopped reading + from the summary database and caused all kinds crazy message counts to + appear in Evolution's folder tree (often negative counts, or negative + counts cast to an unsigned integer). + + Message counts are back to normal now. + + Reverts part of commit 42489b26c45956c66186a5dc96083437cf7a579a. + + (cherry picked from commit 1422d8fc82b8c2d11b782ac21c5eb57e9fc1042c) + + camel/camel-folder-summary.c | 33 +++++++++++++++++++++++++++------ + 1 file changed, 27 insertions(+), 6 deletions(-) + +commit c8f4ed52aef77adbdb5a4d11506bfe8176168606 +Author: Milan Crha +Date: Wed Jul 4 11:52:55 2012 +0200 + + Bug #559391 - Wrong number of unread mails in folder tree + + camel/camel-folder-summary.c | 63 +++++++++++++++++++++--------------------- + 1 file changed, 31 insertions(+), 32 deletions(-) + +commit 098fe53f08a8066695801e9e066d389c742e48cb +Author: Milan Crha +Date: Mon Jul 2 10:48:28 2012 +0200 + + Bug #679245 - Local address book not created + + addressbook/backends/file/e-book-backend-file.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 15a56d6b9852fe2a3cac24b3dd92186ad46ed467 +Author: Milan Crha +Date: Tue Jun 26 14:03:35 2012 +0200 + + Bug #678856 - Crash in add_instance() at e-cal-client.c:1311 + + calendar/libecal/e-cal-client.c | 30 ++++++++++++++++++++---------- + calendar/libecal/e-cal.c | 11 +++++++---- + 2 files changed, 27 insertions(+), 14 deletions(-) + +commit 785e1dd46b8e701f5ec61c0fb3f7b6da54e7f524 +Author: Matthew Barnes +Date: Sun Jun 17 18:58:45 2012 -0400 + + Post-release version bump. + + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 967212df27ac7cd03f79c237b693200b9df4ef58 Author: Matthew Barnes Date: Sun Jun 17 18:50:44 2012 -0400 - NEWS update for 3.4.2 release. + NEWS update for 3.4.3 release. NEWS | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff -Nru evolution-data-server-3.4.3/configure evolution-data-server-3.4.4/configure --- evolution-data-server-3.4.3/configure 2012-06-18 00:10:51.000000000 +0200 +++ evolution-data-server-3.4.4/configure 2012-08-12 23:32:13.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for evolution-data-server 3.4.3. +# Generated by GNU Autoconf 2.69 for evolution-data-server 3.4.4. # # Report bugs to . # @@ -651,8 +651,8 @@ # Identity of this package. PACKAGE_NAME='evolution-data-server' PACKAGE_TARNAME='evolution-data-server' -PACKAGE_VERSION='3.4.3' -PACKAGE_STRING='evolution-data-server 3.4.3' +PACKAGE_VERSION='3.4.4' +PACKAGE_STRING='evolution-data-server 3.4.4' PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=Evolution-Data-Server' PACKAGE_URL='' @@ -1697,7 +1697,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 3.4.3 to adapt to many kinds of systems. +\`configure' configures evolution-data-server 3.4.4 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1768,7 +1768,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of evolution-data-server 3.4.3:";; + short | recursive ) echo "Configuration of evolution-data-server 3.4.4:";; esac cat <<\_ACEOF @@ -2008,7 +2008,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -evolution-data-server configure 3.4.3 +evolution-data-server configure 3.4.4 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2431,7 +2431,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 3.4.3, which was +It was created by evolution-data-server $as_me 3.4.4, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -3247,7 +3247,7 @@ # Define the identity of the package. PACKAGE='evolution-data-server' - VERSION='3.4.3' + VERSION='3.4.4' cat >>confdefs.h <<_ACEOF @@ -3448,7 +3448,7 @@ EDS_MAJOR_VERSION=3 EDS_MINOR_VERSION=4 -EDS_MICRO_VERSION=3 +EDS_MICRO_VERSION=4 @@ -9921,10 +9921,6 @@ fi ;; -gnu*) - lt_cv_deplibs_check_method=pass_all - ;; - haiku*) lt_cv_deplibs_check_method=pass_all ;; @@ -9963,7 +9959,7 @@ ;; # This must be glibc/ELF. -linux* | k*bsd*-gnu | kopensolaris*-gnu) +linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) lt_cv_deplibs_check_method=pass_all ;; @@ -13046,7 +13042,7 @@ lt_prog_compiler_static='-non_shared' ;; - linux* | k*bsd*-gnu | kopensolaris*-gnu) + linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) case $cc_basename in # old Intel for x86_64 which still supported -KPIC. ecc*) @@ -15216,17 +15212,6 @@ esac ;; -gnu*) - version_type=linux # correct to gnu/linux during the next big refactor - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - ;; - haiku*) version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no @@ -15343,7 +15328,7 @@ ;; # This must be glibc/ELF. -linux* | k*bsd*-gnu | kopensolaris*-gnu) +linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no @@ -23092,7 +23077,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 3.4.3, which was +This file was extended by evolution-data-server $as_me 3.4.4, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -23158,7 +23143,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -evolution-data-server config.status 3.4.3 +evolution-data-server config.status 3.4.4 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -Nru evolution-data-server-3.4.3/configure.ac evolution-data-server-3.4.4/configure.ac --- evolution-data-server-3.4.3/configure.ac 2012-06-18 00:09:40.000000000 +0200 +++ evolution-data-server-3.4.4/configure.ac 2012-08-12 23:28:16.000000000 +0200 @@ -2,7 +2,7 @@ dnl Evolution-Data-Server version m4_define([eds_major_version], [3]) m4_define([eds_minor_version], [4]) -m4_define([eds_micro_version], [3]) +m4_define([eds_micro_version], [4]) m4_define([eds_version], [eds_major_version.eds_minor_version.eds_micro_version]) diff -Nru evolution-data-server-3.4.3/debian/changelog evolution-data-server-3.4.4/debian/changelog --- evolution-data-server-3.4.3/debian/changelog 2012-06-19 18:46:45.000000000 +0200 +++ evolution-data-server-3.4.4/debian/changelog 2012-10-21 18:51:15.000000000 +0200 @@ -1,3 +1,10 @@ +evolution-data-server (3.4.4-1) unstable; urgency=low + + * New upstream bugfix release. + * Bump libglib2.0-dev build-dep to 2.32 for GRecMutex. + + -- Jordi Mallach Mon, 08 Oct 2012 19:29:57 +0200 + evolution-data-server (3.4.3-1) unstable; urgency=low * Team upload. diff -Nru evolution-data-server-3.4.3/debian/control evolution-data-server-3.4.4/debian/control --- evolution-data-server-3.4.3/debian/control 2012-06-19 18:30:38.000000000 +0200 +++ evolution-data-server-3.4.4/debian/control 2012-10-21 18:09:53.000000000 +0200 @@ -29,7 +29,7 @@ libdb-dev, libdbus-glib-1-dev (>= 0.6), libdbus-glib-1-doc, - libglib2.0-dev (>= 2.30), + libglib2.0-dev (>= 2.32), libglib2.0-doc, libgconf2-dev, libgdata-dev (>= 0.10), diff -Nru evolution-data-server-3.4.3/docs/Makefile.in evolution-data-server-3.4.4/docs/Makefile.in --- evolution-data-server-3.4.3/docs/Makefile.in 2012-06-18 00:11:10.000000000 +0200 +++ evolution-data-server-3.4.4/docs/Makefile.in 2012-08-12 23:32:34.000000000 +0200 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.5 from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, diff -Nru evolution-data-server-3.4.3/docs/reference/addressbook/libebook/html/ch01.html evolution-data-server-3.4.4/docs/reference/addressbook/libebook/html/ch01.html --- evolution-data-server-3.4.3/docs/reference/addressbook/libebook/html/ch01.html 2012-06-18 00:51:09.000000000 +0200 +++ evolution-data-server-3.4.4/docs/reference/addressbook/libebook/html/ch01.html 2012-08-13 01:33:53.000000000 +0200 @@ -21,7 +21,7 @@

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

+Evolution-Data-Server Manual: Address Book Client (libebook)
EBookClient diff -Nru evolution-data-server-3.4.3/docs/reference/addressbook/libebook/html/ch02.html evolution-data-server-3.4.4/docs/reference/addressbook/libebook/html/ch02.html --- evolution-data-server-3.4.3/docs/reference/addressbook/libebook/html/ch02.html 2012-06-18 00:51:09.000000000 +0200 +++ evolution-data-server-3.4.4/docs/reference/addressbook/libebook/html/ch02.html 2012-08-13 01:33:53.000000000 +0200 @@ -21,7 +21,7 @@

-Deprecated Classes

+Deprecated Classes
EBook diff -Nru evolution-data-server-3.4.3/docs/reference/addressbook/libebook/html/EBookClient.html evolution-data-server-3.4.4/docs/reference/addressbook/libebook/html/EBookClient.html --- evolution-data-server-3.4.3/docs/reference/addressbook/libebook/html/EBookClient.html 2012-06-18 00:51:09.000000000 +0200 +++ evolution-data-server-3.4.4/docs/reference/addressbook/libebook/html/EBookClient.html 2012-08-13 01:33:53.000000000 +0200 @@ -48,7 +48,7 @@ GError * e_book_client_error_create (EBookClientError code, const gchar *custom_msg); struct EBookClient; -EBookClient * e_book_client_new (ESource *source, +EBookClient * e_book_client_new (ESource *source, GError **error); EBookClient * e_book_client_new_from_uri (const gchar *uri, GError **error); @@ -56,9 +56,9 @@ EBookClient * e_book_client_new_default (GError **error); gboolean e_book_client_set_default (EBookClient *client, GError **error); -gboolean e_book_client_set_default_source (ESource *source, +gboolean e_book_client_set_default_source (ESource *source, GError **error); -gboolean e_book_client_get_sources (ESourceList **sources, +gboolean e_book_client_get_sources (ESourceList **sources, GError **error); gboolean e_book_client_get_self (EContact **contact, EBookClient **client, @@ -223,7 +223,7 @@

Object Hierarchy

   GObject
-   +----EClient
+   +----EClient
          +----EBookClient
@@ -338,19 +338,19 @@

e_book_client_new ()

-
EBookClient *       e_book_client_new                   (ESource *source,
+
EBookClient *       e_book_client_new                   (ESource *source,
                                                          GError **error);

 

 Creates a new EBookClient corresponding to the given source.  There are
 only two operations that are valid on this book at this point:
-e_client_open(), and e_client_remove().
+e_client_open(), and e_client_remove().
 

 

-
+
@@ -448,7 +448,7 @@
 
gboolean            e_book_client_set_default           (EBookClient *client,
                                                          GError **error);

-Sets the ESource of the EBookClient as the "default" addressbook.  This is the source
+Sets the ESource of the EBookClient as the "default" addressbook.  This is the source
 that will be loaded in the e_book_client_get_default_addressbook() call.
 

 
 
 

 
source :
An ESource pointerAn ESource pointer
 

 

 
error :

 
 

@@ -474,7 +474,7 @@
 

 
e_book_client_set_default_source ()

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

 

 Sets source as the "default" addressbook.  This is the source that
@@ -485,7 +485,7 @@
 

-
+
@@ -503,7 +503,7 @@
 

 
e_book_client_get_sources ()

-
gboolean            e_book_client_get_sources           (ESourceList **sources,
+
gboolean            e_book_client_get_sources           (ESourceList **sources,
                                                          GError **error);

 

 Populate @*sources with the list of all sources which have been
@@ -514,7 +514,7 @@
 

-
@@ -824,7 +824,7 @@
 

 Finishes previous call of e_book_client_add_contacts() and
 sets added_uids to the UIDs of newly added contacts if successful.
-This GSList should be freed with e_client_util_free_string_slist().
+This GSList should be freed with e_client_util_free_string_slist().
 

 If any of the contacts cannot be inserted, all of the insertions will be
@@ -876,7 +876,7 @@
 

 Adds contacts to client and
 sets added_uids to the UIDs of newly added contacts if successful.
-This GSList should be freed with e_client_util_free_string_slist().
+This GSList should be freed with e_client_util_free_string_slist().
 

 If any of the contacts cannot be inserted, all of the insertions will be
@@ -1731,7 +1731,7 @@
 

 Finishes previous call of e_book_client_get_contacts().
 If successful, then the contacts is set to newly allocated list of EContact-s,
-which should be freed with e_client_util_free_object_slist().
+which should be freed with e_client_util_free_object_slist().
 

 
 

 
source :
An ESource pointerAn ESource pointer
 

 

 
error :

 

 

 
sources :
A pointer to an ESourceList to set. [out]
+A pointer to an ESourceList to set. [out]
 
 

 

 
 
 
@@ -1776,7 +1776,7 @@
 

 Query client with sexp, receiving a list of contacts which matched.
 If successful, then the contacts is set to newly allocated GSList of
-EContact-s, which should be freed with e_client_util_free_object_slist().
+EContact-s, which should be freed with e_client_util_free_object_slist().
 

 Note: sexp can be obtained through EBookQuery, by converting it
@@ -1876,7 +1876,7 @@
 

 Finishes previous call of e_book_client_get_contacts_uids().
 If successful, then the contacts_uids is set to newly allocated list
-of UID strings, which should be freed with e_client_util_free_string_slist().
+of UID strings, which should be freed with e_client_util_free_string_slist().
 

 

 
 
@@ -1922,7 +1922,7 @@
 

 Query client with sexp, receiving a list of contacts UIDs which matched.
 If successful, then the contacts_uids is set to newly allocated list
-of UID strings, which should be freed with e_client_util_free_string_slist().
+of UID strings, which should be freed with e_client_util_free_string_slist().
 

 Note: sexp can be obtained through EBookQuery, by converting it
diff -Nru evolution-data-server-3.4.3/docs/reference/addressbook/libebook/html/EBook.html evolution-data-server-3.4.4/docs/reference/addressbook/libebook/html/EBook.html
--- evolution-data-server-3.4.3/docs/reference/addressbook/libebook/html/EBook.html	2012-06-18 00:51:09.000000000 +0200
+++ evolution-data-server-3.4.4/docs/reference/addressbook/libebook/html/EBook.html	2012-08-13 01:33:53.000000000 +0200
@@ -42,7 +42,7 @@
 

 
Synopsis

 
struct              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 gchar *uri,
@@ -50,7 +50,7 @@
 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);
@@ -66,7 +66,7 @@
 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,
@@ -122,7 +122,7 @@
                                                          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);
 #define             e_return_error_if_fail              (expr,
                                                          error_code)
@@ -159,7 +159,7 @@
                                                          gpointer closure);
 void                (*EBookEListAsyncCallback)          (EBook *book,
                                                          const GError *error,
-                                                         EList *list,
+                                                         EList *list,
                                                          gpointer closure);
 void                (*EBookCallback)                    (EBook *book,
                                                          EBookStatus status,
@@ -170,7 +170,7 @@
                                                          gpointer closure);
 void                (*EBookEListCallback)               (EBook *book,
                                                          EBookStatus status,
-                                                         EList *list,
+                                                         EList *list,
                                                          gpointer closure);
 void                (*EBookListCallback)                (EBook *book,
                                                          EBookStatus status,
@@ -348,7 +348,7 @@
 

 

 
e_book_new ()

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

 

 
Warning

@@ -364,7 +364,7 @@
 

-
@@ -474,7 +474,7 @@
 
e_book_set_default_addressbook has been deprecated since version 3.2 and should not be used in newly-written code. Use e_book_client_set_default_addressbook() instead.

-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.
 

 

 
 

 
source :
an ESource
+an ESource
 
 

 

 
 
 

@@ -499,7 +499,7 @@
 

 
e_book_set_default_source ()

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

 

 
Warning

@@ -514,7 +514,7 @@
 

-
@@ -537,7 +537,7 @@
                                                          GError **error);

 
Warning

-
e_book_remove has been deprecated since version 3.2 and should not be used in newly-written code. Use e_client_remove_sync() on an EBookClient object instead.

+
e_book_remove has been deprecated since version 3.2 and should not be used in newly-written code. Use e_client_remove_sync() on an EBookClient object instead.

 

 Removes the backing data for this EBook. For example, with the file backend this
@@ -571,7 +571,7 @@
                                                          GError **error);
 

 
Warning

-
e_book_open has been deprecated since version 3.2 and should not be used in newly-written code. Use e_client_open_sync() on an EBookClient object instead.

+
e_book_open has been deprecated since version 3.2 and should not be used in newly-written code. Use e_client_open_sync() on an EBookClient object instead.

 

 Opens the addressbook, making it ready for queries and other operations.
@@ -608,7 +608,7 @@
                                                          GError **error);
 

 
Warning

-
e_book_get_supported_fields has been deprecated since version 3.2 and should not be used in newly-written code. Use e_client_get_backend_property_sync() on
+
e_book_get_supported_fields has been deprecated since version 3.2 and should not be used in newly-written code. Use e_client_get_backend_property_sync() on
 an EBookClient object with BOOK_BACKEND_PROPERTY_SUPPORTED_FIELDS instead.

 

@@ -650,7 +650,7 @@
                                                          GError **error);
 

 
Warning

-
e_book_get_supported_auth_methods has been deprecated since version 3.2 and should not be used in newly-written code. Use e_client_get_backend_property_sync() on
+
e_book_get_supported_auth_methods has been deprecated since version 3.2 and should not be used in newly-written code. Use e_client_get_backend_property_sync() on
 an EBookClient object with BOOK_BACKEND_PROPERTY_SUPPORTED_AUTH_METHODS instead.

 

@@ -691,7 +691,7 @@
                                                          GError **error);
 

 
Warning

-
e_book_get_required_fields has been deprecated since version 3.2 and should not be used in newly-written code. Use e_client_get_backend_property_sync() on
+
e_book_get_required_fields has been deprecated since version 3.2 and should not be used in newly-written code. Use e_client_get_backend_property_sync() on
 an EBookClient object with BOOK_BACKEND_PROPERTY_REQUIRED_FIELDS instead.

 

@@ -728,13 +728,13 @@
 

 
e_book_get_source ()

-
ESource *           e_book_get_source                   (EBook *book);

+
ESource *           e_book_get_source                   (EBook *book);

 

 
Warning

-
e_book_get_source has been deprecated since version 3.2 and should not be used in newly-written code. Use e_client_get_source() on an EBookClient object instead.

+
e_book_get_source has been deprecated since version 3.2 and should not be used in newly-written code. Use e_client_get_source() on an EBookClient object instead.

 

 

-Get the ESource that this book has loaded.
+Get the ESource that this book has loaded.
 

 

 
 

 
source :
an ESource
+an ESource
 
 

 

 
 
 
 
 
 
 
@@ -758,7 +758,7 @@
 
gboolean            e_book_is_online                    (EBook *book);

 
Warning

-
e_book_is_online has been deprecated since version 3.2 and should not be used in newly-written code. Use e_client_is_online() on an EBookClient object instead.

+
e_book_is_online has been deprecated since version 3.2 and should not be used in newly-written code. Use e_client_is_online() on an EBookClient object instead.

 

 Check if this book is connected.
@@ -785,7 +785,7 @@
 
gboolean            e_book_is_opened                    (EBook *book);

 
Warning

-
e_book_is_opened has been deprecated since version 3.2 and should not be used in newly-written code. Use e_client_is_opened() on an EBookClient object instead.

+
e_book_is_opened has been deprecated since version 3.2 and should not be used in newly-written code. Use e_client_is_opened() on an EBookClient object instead.

 

 Check if this book has been opened.
@@ -1227,7 +1227,7 @@
 
const gchar *       e_book_get_uri                      (EBook *book);

 
Warning

-
e_book_get_uri has been deprecated since version 3.2 and should not be used in newly-written code. Use e_client_get_uri() on an EBookClient object instead.

+
e_book_get_uri has been deprecated since version 3.2 and should not be used in newly-written code. Use e_client_get_uri() on an EBookClient object instead.

 

 Get the URI that this book has loaded. This string should not be freed.
@@ -1254,7 +1254,7 @@
                                                          GError **error);
 

 
Warning

-
e_book_get_static_capabilities has been deprecated since version 3.2 and should not be used in newly-written code. Use e_client_get_capabilities() on an EBookClient object.

+
e_book_get_static_capabilities has been deprecated since version 3.2 and should not be used in newly-written code. Use e_client_get_capabilities() on an EBookClient object.

 

 Get the list of capabilities which the backend for this address book
@@ -1286,7 +1286,7 @@
                                                          const gchar *cap);
 

 
Warning

-
e_book_check_static_capability has been deprecated since version 3.2 and should not be used in newly-written code. Use e_client_check_capability() on an EBookClient object instead.

+
e_book_check_static_capability has been deprecated since version 3.2 and should not be used in newly-written code. Use e_client_check_capability() on an EBookClient object instead.

 

 Check to see if the backend for this address book supports the capability
@@ -1318,7 +1318,7 @@
 
gboolean            e_book_is_writable                  (EBook *book);

 
Warning

-
e_book_is_writable has been deprecated since version 3.2 and should not be used in newly-written code. Use e_client_is_readonly() on an EBookClient object instead.

+
e_book_is_writable has been deprecated since version 3.2 and should not be used in newly-written code. Use e_client_is_readonly() on an EBookClient object instead.

 

 Check if this book is writable.
@@ -1346,7 +1346,7 @@
                                                          GError **error);
 

 
Warning

-
e_book_cancel has been deprecated since version 3.2 and should not be used in newly-written code. Use e_client_cancel_all() or e_client_cancel_op() on an EBookClient object instead.

+
e_book_cancel has been deprecated since version 3.2 and should not be used in newly-written code. Use e_client_cancel_all() or e_client_cancel_op() on an EBookClient object instead.

 

 Used to cancel an already running operation on book.  This
@@ -1386,7 +1386,7 @@
                                                          GError **error);
 

 
Warning

-
e_book_cancel_async_op has been deprecated since version 3.2 and should not be used in newly-written code. Use e_client_cancel_all() or e_client_cancel_op() on an EBookClient object instead.

+
e_book_cancel_async_op has been deprecated since version 3.2 and should not be used in newly-written code. Use e_client_cancel_all() or e_client_cancel_op() on an EBookClient object instead.

 

 Similar to above e_book_cancel function, only cancels last, still running,
@@ -1502,7 +1502,7 @@
 

 
e_book_get_addressbooks ()

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

 

 
Warning

@@ -1517,7 +1517,7 @@
 

-
@@ -1645,7 +1645,7 @@
 
EBookEListAsyncCallback ()
void                (*EBookEListAsyncCallback)          (EBook *book,
                                                          const GError *error,
-                                                         EList *list,
+                                                         EList *list,
                                                          gpointer closure);

 
Warning

@@ -1681,7 +1681,7 @@
 
EBookEListCallback ()

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

 

 
Warning

@@ -1733,7 +1733,7 @@
                                                          gpointer closure);
 

 
Warning

-
e_book_open_async has been deprecated since version 3.2 and should not be used in newly-written code. Use e_client_open() and e_client_open_finish() on an EBookClient object instead.

+
e_book_open_async has been deprecated since version 3.2 and should not be used in newly-written code. Use e_client_open() and e_client_open_finish() on an EBookClient object instead.

 

 

 Opens the addressbook, making it ready for queries and other operations.
@@ -1777,7 +1777,7 @@
                                                          gpointer closure);
 

 
Warning

-
e_book_remove_async has been deprecated since version 3.2 and should not be used in newly-written code. Use e_client_remove() and e_client_remove_finish() on an EBookClient object instead.

+
e_book_remove_async has been deprecated since version 3.2 and should not be used in newly-written code. Use e_client_remove() and e_client_remove_finish() on an EBookClient object instead.

 

 

 Remove the backing data for this EBook. For example, with the file backend this
@@ -1817,7 +1817,7 @@
                                                          gpointer closure);
 

 
Warning

-
e_book_get_supported_fields_async has been deprecated since version 3.2 and should not be used in newly-written code. Use e_client_get_backend_property() and e_client_get_backend_property_finish()
+
e_book_get_supported_fields_async has been deprecated since version 3.2 and should not be used in newly-written code. Use e_client_get_backend_property() and e_client_get_backend_property_finish()
 on an EBookClient object with BOOK_BACKEND_PROPERTY_SUPPORTED_FIELDS instead.

 

 

@@ -1860,7 +1860,7 @@
                                                          gpointer closure);
 

 
Warning

-
e_book_get_supported_auth_methods_async has been deprecated since version 3.2 and should not be used in newly-written code. Use e_client_get_backend_property() and e_client_get_backend_property_finish()
+
e_book_get_supported_auth_methods_async has been deprecated since version 3.2 and should not be used in newly-written code. Use e_client_get_backend_property() and e_client_get_backend_property_finish()
 on an EBookClient object with BOOK_BACKEND_PROPERTY_SUPPORTED_AUTH_METHODS instead.

 

 

@@ -2378,7 +2378,7 @@
                                                          gpointer closure);
 

 
Warning

-
e_book_get_required_fields_async has been deprecated since version 3.2 and should not be used in newly-written code. Use e_client_get_backend_property() and e_client_get_backend_property_finish()
+
e_book_get_required_fields_async has been deprecated since version 3.2 and should not be used in newly-written code. Use e_client_get_backend_property() and e_client_get_backend_property_finish()
 on an EBookClient object with BOOK_BACKEND_PROPERTY_REQUIRED_FIELDS instead.

 

 

diff -Nru evolution-data-server-3.4.3/docs/reference/addressbook/libebook/Makefile.in evolution-data-server-3.4.4/docs/reference/addressbook/libebook/Makefile.in
--- evolution-data-server-3.4.3/docs/reference/addressbook/libebook/Makefile.in	2012-06-18 00:11:11.000000000 +0200
+++ evolution-data-server-3.4.4/docs/reference/addressbook/libebook/Makefile.in	2012-08-12 23:32:35.000000000 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.5 from Makefile.am.
+# Makefile.in generated by automake 1.11.6 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
diff -Nru evolution-data-server-3.4.3/docs/reference/addressbook/libedata-book/html/ch01.html evolution-data-server-3.4.4/docs/reference/addressbook/libedata-book/html/ch01.html
--- evolution-data-server-3.4.3/docs/reference/addressbook/libedata-book/html/ch01.html	2012-06-18 00:51:10.000000000 +0200
+++ evolution-data-server-3.4.4/docs/reference/addressbook/libedata-book/html/ch01.html	2012-08-13 01:33:54.000000000 +0200
@@ -21,7 +21,7 @@
 

 

 
 
 
 
 
 
 
 
 
 
 
 
 
 

 
addressbook_sources :
A pointer to a ESourceList to set. [out]
+A pointer to a ESourceList to set. [out]
 
 

 

 
 

 

 

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

+Evolution-Data-Server Manual: Address Book Backend (libedata-book)
EBookBackend diff -Nru evolution-data-server-3.4.3/docs/reference/addressbook/libedata-book/html/EBookBackendCache.html evolution-data-server-3.4.4/docs/reference/addressbook/libedata-book/html/EBookBackendCache.html --- evolution-data-server-3.4.3/docs/reference/addressbook/libedata-book/html/EBookBackendCache.html 2012-06-18 00:51:10.000000000 +0200 +++ evolution-data-server-3.4.4/docs/reference/addressbook/libedata-book/html/EBookBackendCache.html 2012-08-13 01:33:54.000000000 +0200 @@ -41,10 +41,10 @@

Synopsis

struct              EBookBackendCache;
 EBookBackendCache * e_book_backend_cache_new            (const gchar *filename);
-EContact *          e_book_backend_cache_get_contact    (EBookBackendCache *cache,
+EContact *          e_book_backend_cache_get_contact    (EBookBackendCache *cache,
                                                          const gchar *uid);
 gboolean            e_book_backend_cache_add_contact    (EBookBackendCache *cache,
-                                                         EContact *contact);
+                                                         EContact *contact);
 gboolean            e_book_backend_cache_remove_contact (EBookBackendCache *cache,
                                                          const gchar *uid);
 gboolean            e_book_backend_cache_check_contact  (EBookBackendCache *cache,
@@ -64,7 +64,7 @@
 
Object Hierarchy

 
   GObject
-   +----EFileCache
+   +----EFileCache
          +----EBookBackendCache
@@ -83,7 +83,7 @@ 
EBookBackendCache * e_book_backend_cache_new            (const gchar *filename);

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

@@ -103,10 +103,10 @@

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 gchar *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.
 

@@ -124,7 +124,7 @@
- +

Returns :

A cached EContact, or NULL if uid is not cached.A cached EContact, or NULL if uid is not cached.
@@ -133,7 +133,7 @@

e_book_backend_cache_add_contact ()

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

Adds contact to cache.

@@ -147,7 +147,7 @@

contact :

-an EContact +an EContact @@ -220,7 +220,7 @@ 
GList *             e_book_backend_cache_get_contacts   (EBookBackendCache *cache,
                                                          const gchar *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.

@@ -238,7 +238,7 @@

Returns :

-A GList of pointers to EContact. +A GList of pointers to EContact.
diff -Nru evolution-data-server-3.4.3/docs/reference/addressbook/libedata-book/html/EBookBackendFactory.html evolution-data-server-3.4.4/docs/reference/addressbook/libedata-book/html/EBookBackendFactory.html --- evolution-data-server-3.4.3/docs/reference/addressbook/libedata-book/html/EBookBackendFactory.html 2012-06-18 00:51:10.000000000 +0200 +++ evolution-data-server-3.4.4/docs/reference/addressbook/libedata-book/html/EBookBackendFactory.html 2012-08-13 01:33:54.000000000 +0200 @@ -46,8 +46,8 @@

Object Hierarchy

   GObject
-   +----EExtension
-         +----EBackendFactory
+   +----EExtension
+         +----EBackendFactory
                +----EBookBackendFactory
diff -Nru evolution-data-server-3.4.3/docs/reference/addressbook/libedata-book/html/EBookBackend.html evolution-data-server-3.4.4/docs/reference/addressbook/libedata-book/html/EBookBackend.html --- evolution-data-server-3.4.3/docs/reference/addressbook/libedata-book/html/EBookBackend.html 2012-06-18 00:51:10.000000000 +0200 +++ evolution-data-server-3.4.4/docs/reference/addressbook/libedata-book/html/EBookBackend.html 2012-08-13 01:33:54.000000000 +0200 @@ -65,7 +65,7 @@ gboolean e_book_backend_is_removed (EBookBackend *backend); void e_book_backend_authenticate_user (EBookBackend *backend, GCancellable *cancellable, - ECredentials *credentials); + ECredentials *credentials); void e_book_backend_get_backend_property (EBookBackend *backend, EDataBook *book, guint32 opid, @@ -133,7 +133,7 @@ gboolean (*callback) (EDataBookView *view, gpointer user_data), gpointer user_data); void e_book_backend_notify_update (EBookBackend *backend, - const EContact *contact); + const EContact *contact); void e_book_backend_notify_remove (EBookBackend *backend, const gchar *id); void e_book_backend_notify_complete (EBookBackend *backend); @@ -145,7 +145,7 @@ gboolean is_online); void e_book_backend_notify_auth_required (EBookBackend *backend, gboolean is_self, - const ECredentials *credentials); + const ECredentials *credentials); void e_book_backend_notify_opened (EBookBackend *backend, GError *error); void e_book_backend_notify_property_changed @@ -166,7 +166,7 @@

Object Hierarchy

   GObject
-   +----EBackend
+   +----EBackend
          +----EBookBackend
                +----EBookBackendSync
@@ -321,7 +321,7 @@

Note that EBookBackend is initialized with a usable default based on -the ESource given to e_book_backend_open(). Backends should +the ESource given to e_book_backend_open(). Backends should not override the default without good reason.

@@ -497,7 +497,7 @@

e_book_backend_authenticate_user ()

void                e_book_backend_authenticate_user    (EBookBackend *backend,
                                                          GCancellable *cancellable,
-                                                         ECredentials *credentials);
+ ECredentials *credentials);

Notifies backend about credentials provided by user to use for authentication. This notification is usually called during @@ -525,7 +525,7 @@

+ECredentials to use for authentication

credentials :

 -ECredentials to use for authentication
@@ -1132,7 +1132,7 @@

e_book_backend_notify_update ()

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

Notifies all of backend's book views about the new or modified contacts contact. @@ -1284,7 +1284,7 @@

e_book_backend_notify_auth_required ()

void                e_book_backend_notify_auth_required (EBookBackend *backend,
                                                          gboolean is_self,
-                                                         const ECredentials *credentials);
+ const ECredentials *credentials);

Notifies clients that backend requires authentication in order to connect. This function call does not influence 'opening', but @@ -1316,7 +1316,7 @@

credentials :

-an ECredentials that contains extra information for +an ECredentials that contains extra information for a source for which authentication is requested. This parameter can be NULL to indicate "for this book". diff -Nru evolution-data-server-3.4.3/docs/reference/addressbook/libedata-book/html/EBookBackendSExp.html evolution-data-server-3.4.4/docs/reference/addressbook/libedata-book/html/EBookBackendSExp.html --- evolution-data-server-3.4.3/docs/reference/addressbook/libedata-book/html/EBookBackendSExp.html 2012-06-18 00:51:10.000000000 +0200 +++ evolution-data-server-3.4.4/docs/reference/addressbook/libedata-book/html/EBookBackendSExp.html 2012-08-13 01:33:54.000000000 +0200 @@ -44,7 +44,7 @@ gboolean e_book_backend_sexp_match_vcard (EBookBackendSExp *sexp, const gchar *vcard); gboolean e_book_backend_sexp_match_contact (EBookBackendSExp *sexp, - EContact *contact); + EContact *contact);
@@ -116,7 +116,7 @@

e_book_backend_sexp_match_contact ()

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

Checks if contact matches sexp.

@@ -130,7 +130,7 @@

contact :

-an EContact +an EContact diff -Nru evolution-data-server-3.4.3/docs/reference/addressbook/libedata-book/html/EBookBackendSummary.html evolution-data-server-3.4.4/docs/reference/addressbook/libedata-book/html/EBookBackendSummary.html --- evolution-data-server-3.4.3/docs/reference/addressbook/libedata-book/html/EBookBackendSummary.html 2012-06-18 00:51:10.000000000 +0200 +++ evolution-data-server-3.4.4/docs/reference/addressbook/libedata-book/html/EBookBackendSummary.html 2012-08-13 01:33:54.000000000 +0200 @@ -45,7 +45,7 @@ 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 gchar *id); @@ -163,7 +163,7 @@

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. @@ -178,7 +178,7 @@

contact :

-an EContact to add +an EContact to add
diff -Nru evolution-data-server-3.4.3/docs/reference/addressbook/libedata-book/html/EBookBackendSync.html evolution-data-server-3.4.4/docs/reference/addressbook/libedata-book/html/EBookBackendSync.html --- evolution-data-server-3.4.3/docs/reference/addressbook/libedata-book/html/EBookBackendSync.html 2012-06-18 00:51:10.000000000 +0200 +++ evolution-data-server-3.4.4/docs/reference/addressbook/libedata-book/html/EBookBackendSync.html 2012-08-13 01:33:54.000000000 +0200 @@ -109,7 +109,7 @@ void e_book_backend_sync_authenticate_user (EBookBackendSync *backend, GCancellable *cancellable, - ECredentials *credentials, + ECredentials *credentials, GError **error);
@@ -117,7 +117,7 @@

Object Hierarchy

   GObject
-   +----EBackend
+   +----EBackend
          +----EBookBackend
                +----EBookBackendSync
@@ -405,7 +405,7 @@

added_contacts :

-a pointer to a location to store the resulting EContact list +a pointer to a location to store the resulting EContact list

error :

@@ -500,7 +500,7 @@

modified_contacts :

a pointer to a location to store the resulting -EContact objects +EContact objects

error :

@@ -652,7 +652,7 @@ 
void                e_book_backend_sync_authenticate_user
                                                         (EBookBackendSync *backend,
                                                          GCancellable *cancellable,
-                                                         ECredentials *credentials,
+                                                         ECredentials *credentials,
                                                          GError **error);

Authenticates backend with given credentials. @@ -671,7 +671,7 @@

credentials :

-an ECredentials to authenticate with +an ECredentials to authenticate with

error :

diff -Nru evolution-data-server-3.4.3/docs/reference/addressbook/libedata-book/html/EDataBook.html evolution-data-server-3.4.4/docs/reference/addressbook/libedata-book/html/EDataBook.html --- evolution-data-server-3.4.3/docs/reference/addressbook/libedata-book/html/EDataBook.html 2012-06-18 00:51:10.000000000 +0200 +++ evolution-data-server-3.4.4/docs/reference/addressbook/libedata-book/html/EDataBook.html 2012-08-13 01:33:54.000000000 +0200 @@ -110,7 +110,7 @@ void e_data_book_report_online (EDataBook *book, gboolean is_online); void e_data_book_report_auth_required (EDataBook *book, - const ECredentials *credentials); + const ECredentials *credentials); void e_data_book_report_opened (EDataBook *book, const GError *error); void e_data_book_report_backend_property_changed @@ -392,7 +392,7 @@

e_data_book_report_auth_required ()

void                e_data_book_report_auth_required    (EDataBook *book,
-                                                         const ECredentials *credentials);
+ const ECredentials *credentials);
diff -Nru evolution-data-server-3.4.3/docs/reference/addressbook/libedata-book/html/EDataBookView.html evolution-data-server-3.4.4/docs/reference/addressbook/libedata-book/html/EDataBookView.html --- evolution-data-server-3.4.3/docs/reference/addressbook/libedata-book/html/EDataBookView.html 2012-06-18 00:51:10.000000000 +0200 +++ evolution-data-server-3.4.4/docs/reference/addressbook/libedata-book/html/EDataBookView.html 2012-08-13 01:33:54.000000000 +0200 @@ -51,9 +51,9 @@ const gchar * e_data_book_view_get_card_query (EDataBookView *book_view); EBookBackendSExp * e_data_book_view_get_card_sexp (EDataBookView *book_view); EBookBackend * e_data_book_view_get_backend (EDataBookView *book_view); -EBookClientViewFlags e_data_book_view_get_flags (EDataBookView *book_view); +EBookClientViewFlags e_data_book_view_get_flags (EDataBookView *book_view); void e_data_book_view_notify_update (EDataBookView *book_view, - const EContact *contact); + const EContact *contact); void e_data_book_view_notify_update_vcard (EDataBookView *book_view, const gchar *id, @@ -96,7 +96,7 @@ const gchar *card_query, EBookBackendSExp *card_sexp);

-Create a new EDataBookView for the given EBook, filtering on card_sexp, +Create a new EDataBookView for the given EBook, filtering on card_sexp, and place it on DBus at the object path path.

@@ -199,9 +199,9 @@

e_data_book_view_get_flags ()

-
EBookClientViewFlags e_data_book_view_get_flags         (EDataBookView *book_view);
+
EBookClientViewFlags e_data_book_view_get_flags         (EDataBookView *book_view);

-Gets the EBookClientViewFlags that control the behaviour of book_view. +Gets the EBookClientViewFlags that control the behaviour of book_view.

@@ -223,7 +223,7 @@

e_data_book_view_notify_update ()

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

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

- @@ -412,7 +412,7 @@ -

contact :

an EContact +an EContact

book_view :

an EBookView +an EBookView
@@ -430,7 +430,7 @@

book_view :

-an EBookView +an EBookView
diff -Nru evolution-data-server-3.4.3/docs/reference/addressbook/libedata-book/html/libedata-book-e-book-backend-db-cache.html evolution-data-server-3.4.4/docs/reference/addressbook/libedata-book/html/libedata-book-e-book-backend-db-cache.html --- evolution-data-server-3.4.3/docs/reference/addressbook/libedata-book/html/libedata-book-e-book-backend-db-cache.html 2012-06-18 00:51:10.000000000 +0200 +++ evolution-data-server-3.4.4/docs/reference/addressbook/libedata-book/html/libedata-book-e-book-backend-db-cache.html 2012-08-13 01:33:54.000000000 +0200 @@ -37,7 +37,7 @@

Synopsis

-
EContact *          e_book_backend_db_cache_get_contact (DB *db,
+
EContact *          e_book_backend_db_cache_get_contact (DB *db,
                                                          const gchar *uid);
 void                string_to_dbt                       (const gchar *str,
                                                          DBT *dbt);
@@ -47,7 +47,7 @@
                                                         (DB *db,
                                                          const gchar *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 gchar *uid);
@@ -76,10 +76,10 @@
 
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 gchar *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.
 

@@ -96,7 +96,7 @@
 
 
 
Returns :

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

@@ -150,7 +150,7 @@
 

 
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.
 

@@ -163,7 +163,7 @@
 
 
 
contact :

-an EContact
+an EContact
 
 
 
@@ -237,7 +237,7 @@
                                                         (DB *db,
                                                          const gchar *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.

@@ -254,7 +254,7 @@

Returns :

-A GList of pointers to EContact. +A GList of pointers to EContact.
diff -Nru evolution-data-server-3.4.3/docs/reference/addressbook/libedata-book/html/libedata-book-EBookBackendSqliteDB.html evolution-data-server-3.4.4/docs/reference/addressbook/libedata-book/html/libedata-book-EBookBackendSqliteDB.html --- evolution-data-server-3.4.3/docs/reference/addressbook/libedata-book/html/libedata-book-EBookBackendSqliteDB.html 2012-06-18 00:51:10.000000000 +0200 +++ evolution-data-server-3.4.4/docs/reference/addressbook/libedata-book/html/libedata-book-EBookBackendSqliteDB.html 2012-08-13 01:33:54.000000000 +0200 @@ -54,7 +54,7 @@ GError **error); gboolean e_book_backend_sqlitedb_add_contact (EBookBackendSqliteDB *ebsdb, const gchar *folderid, - EContact *contact, + EContact *contact, gboolean partial_content, GError **error); gboolean e_book_backend_sqlitedb_add_contacts @@ -78,7 +78,7 @@ const gchar *uid, gboolean *partial_content, GError **error); -EContact * e_book_backend_sqlitedb_get_contact (EBookBackendSqliteDB *ebsdb, +EContact * e_book_backend_sqlitedb_get_contact (EBookBackendSqliteDB *ebsdb, const gchar *folderid, const gchar *uid, GHashTable *fields_of_interest, @@ -266,7 +266,7 @@

e_book_backend_sqlitedb_add_contact ()

gboolean            e_book_backend_sqlitedb_add_contact (EBookBackendSqliteDB *ebsdb,
                                                          const gchar *folderid,
-                                                         EContact *contact,
+                                                         EContact *contact,
                                                          gboolean partial_content,
                                                          GError **error);

@@ -372,7 +372,7 @@

e_book_backend_sqlitedb_get_contact ()

-
EContact *          e_book_backend_sqlitedb_get_contact (EBookBackendSqliteDB *ebsdb,
+
EContact *          e_book_backend_sqlitedb_get_contact (EBookBackendSqliteDB *ebsdb,
                                                          const gchar *folderid,
                                                          const gchar *uid,
                                                          GHashTable *fields_of_interest,
diff -Nru evolution-data-server-3.4.3/docs/reference/addressbook/libedata-book/html/libedata-book-EDataBookFactory.html evolution-data-server-3.4.4/docs/reference/addressbook/libedata-book/html/libedata-book-EDataBookFactory.html
--- evolution-data-server-3.4.3/docs/reference/addressbook/libedata-book/html/libedata-book-EDataBookFactory.html	2012-06-18 00:51:10.000000000 +0200
+++ evolution-data-server-3.4.4/docs/reference/addressbook/libedata-book/html/libedata-book-EDataBookFactory.html	2012-08-13 01:33:54.000000000 +0200
@@ -38,7 +38,7 @@
 

 
Synopsis

 
struct              EDataBookFactory;
-EDBusServer *       e_data_book_factory_new             (GCancellable *cancellable,
+EDBusServer *       e_data_book_factory_new             (GCancellable *cancellable,
                                                          GError **error);
 

 

@@ -58,7 +58,7 @@
 

 

 
e_data_book_factory_new ()

-
EDBusServer *       e_data_book_factory_new             (GCancellable *cancellable,
+
EDBusServer *       e_data_book_factory_new             (GCancellable *cancellable,
                                                          GError **error);
diff -Nru evolution-data-server-3.4.3/docs/reference/addressbook/libedata-book/Makefile.in evolution-data-server-3.4.4/docs/reference/addressbook/libedata-book/Makefile.in --- evolution-data-server-3.4.3/docs/reference/addressbook/libedata-book/Makefile.in 2012-06-18 00:11:11.000000000 +0200 +++ evolution-data-server-3.4.4/docs/reference/addressbook/libedata-book/Makefile.in 2012-08-12 23:32:36.000000000 +0200 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.5 from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, diff -Nru evolution-data-server-3.4.3/docs/reference/addressbook/Makefile.in evolution-data-server-3.4.4/docs/reference/addressbook/Makefile.in --- evolution-data-server-3.4.3/docs/reference/addressbook/Makefile.in 2012-06-18 00:11:11.000000000 +0200 +++ evolution-data-server-3.4.4/docs/reference/addressbook/Makefile.in 2012-08-12 23:32:35.000000000 +0200 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.5 from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, diff -Nru evolution-data-server-3.4.3/docs/reference/calendar/libecal/html/ch01.html evolution-data-server-3.4.4/docs/reference/calendar/libecal/html/ch01.html --- evolution-data-server-3.4.3/docs/reference/calendar/libecal/html/ch01.html 2012-06-18 00:51:10.000000000 +0200 +++ evolution-data-server-3.4.4/docs/reference/calendar/libecal/html/ch01.html 2012-08-13 01:33:54.000000000 +0200 @@ -21,7 +21,7 @@

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

+Evolution-Data-Server Manual: Calendar Client (libecal)
ECalClient diff -Nru evolution-data-server-3.4.3/docs/reference/calendar/libecal/html/ch02.html evolution-data-server-3.4.4/docs/reference/calendar/libecal/html/ch02.html --- evolution-data-server-3.4.3/docs/reference/calendar/libecal/html/ch02.html 2012-06-18 00:51:10.000000000 +0200 +++ evolution-data-server-3.4.4/docs/reference/calendar/libecal/html/ch02.html 2012-08-13 01:33:54.000000000 +0200 @@ -21,7 +21,7 @@

-Deprecated Classes

+Deprecated Classes
ECal diff -Nru evolution-data-server-3.4.3/docs/reference/calendar/libecal/html/ECalClient.html evolution-data-server-3.4.4/docs/reference/calendar/libecal/html/ECalClient.html --- evolution-data-server-3.4.3/docs/reference/calendar/libecal/html/ECalClient.html 2012-06-18 00:51:10.000000000 +0200 +++ evolution-data-server-3.4.4/docs/reference/calendar/libecal/html/ECalClient.html 2012-08-13 01:33:54.000000000 +0200 @@ -51,7 +51,7 @@ const gchar * e_cal_client_error_to_string (ECalClientError code); GError * e_cal_client_error_create (ECalClientError code, const gchar *custom_msg); -ECalClient * e_cal_client_new (ESource *source, +ECalClient * e_cal_client_new (ESource *source, ECalClientSourceType source_type, GError **error); ECalClient * e_cal_client_new_from_uri (const gchar *uri, @@ -63,10 +63,10 @@ GError **error); gboolean e_cal_client_set_default (ECalClient *client, GError **error); -gboolean e_cal_client_set_default_source (ESource *source, +gboolean e_cal_client_set_default_source (ESource *source, ECalClientSourceType source_type, GError **error); -gboolean e_cal_client_get_sources (ESourceList **sources, +gboolean e_cal_client_get_sources (ESourceList **sources, ECalClientSourceType source_type, GError **error); ECalClientSourceType e_cal_client_get_source_type (ECalClient *client); @@ -364,7 +364,7 @@

Object Hierarchy

   GObject
-   +----EClient
+   +----EClient
          +----ECalClient
@@ -501,20 +501,20 @@

e_cal_client_new ()

-
ECalClient *        e_cal_client_new                    (ESource *source,
+
ECalClient *        e_cal_client_new                    (ESource *source,
                                                          ECalClientSourceType source_type,
                                                          GError **error);

 

 Creates a new ECalClient corresponding to the given source.  There are
 only two operations that are valid on this calendar at this point:
-e_client_open(), and e_client_remove().
+e_client_open(), and e_client_remove().
 

 

-
+
@@ -631,7 +631,7 @@
 
gboolean            e_cal_client_set_default            (ECalClient *client,
                                                          GError **error);

-Sets the ESource of the ECalClient as the "default" calendar.  This is the source
+Sets the ESource of the ECalClient as the "default" calendar.  This is the source
 that will be loaded in the e_cal_client_get_default_calendar() call.
 

 
 
 

 
source :
An ESource pointerAn ESource pointer
 

 

 
source_type :

 
 

@@ -657,7 +657,7 @@
 

 
e_cal_client_set_default_source ()

-
gboolean            e_cal_client_set_default_source     (ESource *source,
+
gboolean            e_cal_client_set_default_source     (ESource *source,
                                                          ECalClientSourceType source_type,
                                                          GError **error);

 

@@ -669,7 +669,7 @@
 

-
+
@@ -691,7 +691,7 @@
 

 
e_cal_client_get_sources ()

-
gboolean            e_cal_client_get_sources            (ESourceList **sources,
+
gboolean            e_cal_client_get_sources            (ESourceList **sources,
                                                          ECalClientSourceType source_type,
                                                          GError **error);

 

@@ -703,7 +703,7 @@
 

-
@@ -2719,7 +2719,7 @@
 

 Finishes previous call of e_cal_client_send_objects() and
 populates users with a list of users to send modified_icalcomp to.
-The users list should be freed with e_client_util_free_string_slist() and
+The users list should be freed with e_client_util_free_string_slist() and
 the modified_icalcomp should be freed with icalcomponent_free().
 

 
 

 
source :
An ESource pointerAn ESource pointer
 

 

 
source_type :

 

 

 
sources :
A pointer to an ESourceList to set. [out]
+A pointer to an ESourceList to set. [out]
 
 

 

 

@@ -2771,7 +2771,7 @@
 

 Requests a calendar backend to send meeting information stored in icalcomp.
 The backend can modify this component and request a send to users in the users list.
-The users list should be freed with e_client_util_free_string_slist() and
+The users list should be freed with e_client_util_free_string_slist() and
 the modified_icalcomp should be freed with icalcomponent_free().
 

 

@@ -2874,7 +2874,7 @@
 

 Finishes previous call of e_cal_client_get_attachment_uris() and
 sets attachment_uris to uris for component's attachments.
-The list should be freed with e_client_util_free_string_slist().
+The list should be freed with e_client_util_free_string_slist().
 

 
@@ -2919,7 +2919,7 @@
                                                          GError **error);

 Queries a calendar for a specified component's object attachment uris.
-The list should be freed with e_client_util_free_string_slist().
+The list should be freed with e_client_util_free_string_slist().
 

 

 
 
diff -Nru evolution-data-server-3.4.3/docs/reference/calendar/libecal/html/ECal.html evolution-data-server-3.4.4/docs/reference/calendar/libecal/html/ECal.html
--- evolution-data-server-3.4.3/docs/reference/calendar/libecal/html/ECal.html	2012-06-18 00:51:10.000000000 +0200
+++ evolution-data-server-3.4.4/docs/reference/calendar/libecal/html/ECal.html	2012-08-13 01:33:54.000000000 +0200
@@ -50,7 +50,7 @@
                                                          const gchar *prompt,
                                                          const gchar *key,
                                                          gpointer user_data);
-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);
@@ -73,7 +73,7 @@
                                                          CalMode mode);
 ECalSourceTypee_cal_get_source_type               (ECal *ecal);
 ECalLoadStatee_cal_get_load_state                (ECal *ecal);
-ESource *           e_cal_get_source                    (ECal *ecal);
+ESource *           e_cal_get_source                    (ECal *ecal);
 const gchar *       e_cal_get_uri                       (ECal *ecal);
 gbooleane_cal_is_read_only                  (ECal *ecal,
                                                          gboolean *read_only,
@@ -202,10 +202,10 @@
                                                          GError **error);
 gbooleane_cal_set_default                   (ECal *ecal,
                                                          GError **error);
-gbooleane_cal_set_default_source            (ESource *source,
+gbooleane_cal_set_default_source            (ESource *source,
                                                          ECalSourceType type,
                                                          GError **error);
-gbooleane_cal_get_sources                   (ESourceList **sources,
+gbooleane_cal_get_sources                   (ESourceList **sources,
                                                          ECalSourceType type,
                                                          GError **error);
 const gchar *       e_cal_get_local_attachment_store    (ECal *ecal);
@@ -329,7 +329,7 @@
 

 
e_cal_new ()

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

 

 
Warning

@@ -344,7 +344,7 @@
 

-
+
@@ -515,7 +515,7 @@
                                                          GError **error);

 
Warning

-
e_cal_open has been deprecated since version 3.2 and should not be used in newly-written code. Use e_client_open_sync() on an ECalClient object instead.

+
e_cal_open has been deprecated since version 3.2 and should not be used in newly-written code. Use e_client_open_sync() on an ECalClient object instead.

 

 Makes a calendar client initiate a request to open a calendar.  The calendar
@@ -556,7 +556,7 @@
                                                          gboolean only_if_exists);
 

 
Warning

-
e_cal_open_async has been deprecated since version 3.2 and should not be used in newly-written code. Use e_client_open()/e_client_open_finish()
+
e_cal_open_async has been deprecated since version 3.2 and should not be used in newly-written code. Use e_client_open()/e_client_open_finish()
 on an ECalClient object instead.

 

@@ -625,7 +625,7 @@
                                                          GError **error);
 

 
Warning

-
e_cal_remove has been deprecated since version 3.2 and should not be used in newly-written code. Use e_client_remove_sync() on an ECalClient object instead.

+
e_cal_remove has been deprecated since version 3.2 and should not be used in newly-written code. Use e_client_remove_sync() on an ECalClient object instead.

 

 Removes a calendar.
@@ -710,7 +710,7 @@
 
ECalLoadState       e_cal_get_load_state                (ECal *ecal);

 
Warning

-
e_cal_get_load_state has been deprecated since version 3.2 and should not be used in newly-written code. Use e_client_is_opened() on an ECalClient instead.

+
e_cal_get_load_state has been deprecated since version 3.2 and should not be used in newly-written code. Use e_client_is_opened() on an ECalClient instead.

 

 Queries the state of loading of a calendar client.
@@ -734,10 +734,10 @@
 

 
e_cal_get_source ()

-
ESource *           e_cal_get_source                    (ECal *ecal);

+
ESource *           e_cal_get_source                    (ECal *ecal);

 

 
Warning

-
e_cal_get_source has been deprecated since version 3.2 and should not be used in newly-written code. Use e_client_get_source() on an ECalClient object instead.

+
e_cal_get_source has been deprecated since version 3.2 and should not be used in newly-written code. Use e_client_get_source() on an ECalClient object instead.

 

 

 Queries the source that is open in a calendar client.
@@ -763,7 +763,7 @@
 
const gchar *       e_cal_get_uri                       (ECal *ecal);

 

 
Warning

-
e_cal_get_uri has been deprecated since version 3.2 and should not be used in newly-written code. Use e_client_get_uri() on an ECalClient object instead.

+
e_cal_get_uri has been deprecated since version 3.2 and should not be used in newly-written code. Use e_client_get_uri() on an ECalClient object instead.

 

 

 Queries the URI that is open in a calendar client.
@@ -828,7 +828,7 @@
                                                          GError **error);
 

 
Warning

-
e_cal_get_cal_address has been deprecated since version 3.2 and should not be used in newly-written code. Use e_client_get_backend_property_sync()
+
e_cal_get_cal_address has been deprecated since version 3.2 and should not be used in newly-written code. Use e_client_get_backend_property_sync()
 with CAL_BACKEND_PROPERTY_CAL_EMAIL_ADDRESS instead.

 

 

@@ -865,7 +865,7 @@
                                                          GError **error);
 

 
Warning

-
e_cal_get_alarm_email_address has been deprecated since version 3.2 and should not be used in newly-written code. Use e_client_get_backend_property_sync()
+
e_cal_get_alarm_email_address has been deprecated since version 3.2 and should not be used in newly-written code. Use e_client_get_backend_property_sync()
 with CAL_BACKEND_PROPERTY_ALARM_EMAIL_ADDRESS instead.

 

 

@@ -1013,7 +1013,7 @@
                                                          const gchar *cap);
 

 
Warning

-
e_cal_get_static_capability has been deprecated since version 3.2 and should not be used in newly-written code. Use e_client_check_capability() on an ECalClient object instead.

+
e_cal_get_static_capability has been deprecated since version 3.2 and should not be used in newly-written code. Use e_client_check_capability() on an ECalClient object instead.

 

 

 Queries the calendar for static capabilities.
@@ -1069,7 +1069,7 @@
 
gboolean            e_cal_get_refresh_supported         (ECal *ecal);

 

 
Warning

-
e_cal_get_refresh_supported has been deprecated since version 3.2 and should not be used in newly-written code. Use e_client_check_refresh_supported() instead.

+
e_cal_get_refresh_supported has been deprecated since version 3.2 and should not be used in newly-written code. Use e_client_check_refresh_supported() instead.

 

 

 Checks whether a calendar supports explicit refreshing (see e_cal_refresh).
@@ -2305,7 +2305,7 @@
 
e_cal_set_default has been deprecated since version 3.2 and should not be used in newly-written code. Use e_cal_client_set_default() instead.

 

-Sets the ESource in ecal as default.
+Sets the ESource in ecal as default.
 

 
                                                                                     
 
 

 
source :
An ESource to be used for the client.An ESource to be used for the client.
 

 

 
type :

 
 
 
 
 
 
 
 
 
@@ -2330,7 +2330,7 @@
 

 
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);

 

@@ -2345,7 +2345,7 @@
 

-
@@ -2367,7 +2367,7 @@
 

 
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-3.4.3/docs/reference/calendar/libecal/html/libecal-e-cal-time-util.html evolution-data-server-3.4.4/docs/reference/calendar/libecal/html/libecal-e-cal-time-util.html
--- evolution-data-server-3.4.3/docs/reference/calendar/libecal/html/libecal-e-cal-time-util.html	2012-06-18 00:51:10.000000000 +0200
+++ evolution-data-server-3.4.4/docs/reference/calendar/libecal/html/libecal-e-cal-time-util.html	2012-08-13 01:33:54.000000000 +0200
@@ -78,8 +78,8 @@
 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,
@@ -669,7 +669,7 @@
 

 

 
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.
 

@@ -692,7 +692,7 @@
 

 

 
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-3.4.3/docs/reference/calendar/libecal/Makefile.in evolution-data-server-3.4.4/docs/reference/calendar/libecal/Makefile.in
--- evolution-data-server-3.4.3/docs/reference/calendar/libecal/Makefile.in	2012-06-18 00:11:12.000000000 +0200
+++ evolution-data-server-3.4.4/docs/reference/calendar/libecal/Makefile.in	2012-08-12 23:32:36.000000000 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.5 from Makefile.am.
+# Makefile.in generated by automake 1.11.6 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
diff -Nru evolution-data-server-3.4.3/docs/reference/calendar/libedata-cal/html/ch01.html evolution-data-server-3.4.4/docs/reference/calendar/libedata-cal/html/ch01.html
--- evolution-data-server-3.4.3/docs/reference/calendar/libedata-cal/html/ch01.html	2012-06-18 00:51:11.000000000 +0200
+++ evolution-data-server-3.4.4/docs/reference/calendar/libedata-cal/html/ch01.html	2012-08-13 01:33:54.000000000 +0200
@@ -21,7 +21,7 @@
 

 

 
 

 
source :
an ESource
+an ESource
 
 

 

 

 

 

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

+Evolution-Data-Server Manual: Calendar Backend (libedata-cal)
ECalBackend diff -Nru evolution-data-server-3.4.3/docs/reference/calendar/libedata-cal/html/ECalBackendCache.html evolution-data-server-3.4.4/docs/reference/calendar/libedata-cal/html/ECalBackendCache.html --- evolution-data-server-3.4.3/docs/reference/calendar/libedata-cal/html/ECalBackendCache.html 2012-06-18 00:51:11.000000000 +0200 +++ evolution-data-server-3.4.4/docs/reference/calendar/libedata-cal/html/ECalBackendCache.html 2012-08-13 01:33:54.000000000 +0200 @@ -41,11 +41,11 @@

Synopsis

struct              ECalBackendCache;
 ECalBackendCache *  e_cal_backend_cache_new             (const gchar *filename);
-ECalComponent *     e_cal_backend_cache_get_component   (ECalBackendCache *cache,
+ECalComponent *     e_cal_backend_cache_get_component   (ECalBackendCache *cache,
                                                          const gchar *uid,
                                                          const gchar *rid);
 gboolean            e_cal_backend_cache_put_component   (ECalBackendCache *cache,
-                                                         ECalComponent *comp);
+                                                         ECalComponent *comp);
 gboolean            e_cal_backend_cache_remove_component
                                                         (ECalBackendCache *cache,
                                                          const gchar *uid,
@@ -86,7 +86,7 @@
 
Object Hierarchy

 
   GObject
-   +----EFileCache
+   +----EFileCache
          +----ECalBackendCache
@@ -125,7 +125,7 @@

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 gchar *uid,
                                                          const gchar *rid);

 

@@ -149,7 +149,7 @@
 
 
 
Returns :

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

 
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 @@ -233,7 +233,7 @@

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-3.4.3/docs/reference/calendar/libedata-cal/html/ECalBackendFactory.html evolution-data-server-3.4.4/docs/reference/calendar/libedata-cal/html/ECalBackendFactory.html --- evolution-data-server-3.4.3/docs/reference/calendar/libedata-cal/html/ECalBackendFactory.html 2012-06-18 00:51:11.000000000 +0200 +++ evolution-data-server-3.4.4/docs/reference/calendar/libedata-cal/html/ECalBackendFactory.html 2012-08-13 01:33:54.000000000 +0200 @@ -46,8 +46,8 @@

Object Hierarchy

   GObject
-   +----EExtension
-         +----EBackendFactory
+   +----EExtension
+         +----EBackendFactory
                +----ECalBackendFactory
diff -Nru evolution-data-server-3.4.3/docs/reference/calendar/libedata-cal/html/ECalBackend.html evolution-data-server-3.4.4/docs/reference/calendar/libedata-cal/html/ECalBackend.html --- evolution-data-server-3.4.3/docs/reference/calendar/libedata-cal/html/ECalBackend.html 2012-06-18 00:51:11.000000000 +0200 +++ evolution-data-server-3.4.4/docs/reference/calendar/libedata-cal/html/ECalBackend.html 2012-08-13 01:33:54.000000000 +0200 @@ -91,7 +91,7 @@ const gchar *prop_value); void e_cal_backend_authenticate_user (ECalBackend *backend, GCancellable *cancellable, - ECredentials *credentials); + ECredentials *credentials); void e_cal_backend_open (ECalBackend *backend, EDataCal *cal, guint32 opid, @@ -133,14 +133,14 @@ guint32 opid, GCancellable *cancellable, const gchar *calobj, - CalObjModType mod); + CalObjModType mod); void e_cal_backend_remove_object (ECalBackend *backend, EDataCal *cal, guint32 opid, GCancellable *cancellable, const gchar *uid, const gchar *rid, - CalObjModType mod); + CalObjModType mod); void e_cal_backend_receive_objects (ECalBackend *backend, EDataCal *cal, guint32 opid, @@ -182,16 +182,16 @@ EDataCalView *view); void e_cal_backend_notify_component_created (ECalBackend *backend, - ECalComponent *component); + ECalComponent *component); void e_cal_backend_notify_component_modified (ECalBackend *backend, - ECalComponent *old_component, - ECalComponent *new_component); + ECalComponent *old_component, + ECalComponent *new_component); void e_cal_backend_notify_component_removed (ECalBackend *backend, - const ECalComponentId *id, - ECalComponent *old_component, - ECalComponent *new_component); + const ECalComponentId *id, + ECalComponent *old_component, + ECalComponent *new_component); void e_cal_backend_notify_object_created (ECalBackend *backend, const gchar *calobj); void e_cal_backend_notify_objects_added (ECalBackend *backend, @@ -206,7 +206,7 @@ EDataCalView *view, const GSList *objects); void e_cal_backend_notify_object_removed (ECalBackend *backend, - const ECalComponentId *id, + const ECalComponentId *id, const gchar *old_object, const gchar *new_object); void e_cal_backend_notify_objects_removed @@ -221,7 +221,7 @@ gboolean is_online); void e_cal_backend_notify_auth_required (ECalBackend *backend, gboolean is_self, - const ECredentials *credentials); + const ECredentials *credentials); void e_cal_backend_notify_opened (ECalBackend *backend, GError *error); void e_cal_backend_notify_property_changed @@ -242,7 +242,7 @@

Object Hierarchy

   GObject
-   +----EBackend
+   +----EBackend
          +----ECalBackend
                +----ECalBackendSync
@@ -521,7 +521,7 @@

Note that ECalBackend is initialized with a usable default based on -"source" and "kind" properties. Backends should +"source" and "kind" properties. Backends should not override the default without good reason.

@@ -830,7 +830,7 @@

e_cal_backend_authenticate_user ()

void                e_cal_backend_authenticate_user     (ECalBackend *backend,
                                                          GCancellable *cancellable,
-                                                         ECredentials *credentials);
+ ECredentials *credentials);

Notifies backend about credentials provided by user to use for authentication. This notification is usually called during @@ -858,7 +858,7 @@

+ECredentials to use for authentication

credentials :

 -ECredentials to use for authentication
@@ -1212,7 +1212,7 @@ guint32 opid, GCancellable *cancellable, const gchar *calobj, - CalObjModType mod); + CalObjModType mod);

Calls the modify_object method on the given backend. This might be finished with e_data_cal_respond_modify_object(). @@ -1258,7 +1258,7 @@ GCancellable *cancellable, const gchar *uid, const gchar *rid, - CalObjModType mod); + CalObjModType mod);

Removes an object in a calendar backend. The backend will notify all of its clients about the change. @@ -1637,12 +1637,12 @@

e_cal_backend_notify_component_created ()

void                e_cal_backend_notify_component_created
                                                         (ECalBackend *backend,
-                                                         ECalComponent *component);
+ ECalComponent *component);

Notifies each of the backend's listeners about a new object.

-Like e_cal_backend_notify_object_created() except takes an ECalComponent +Like e_cal_backend_notify_object_created() except takes an ECalComponent instead of an ical string representation and uses the EDataCalView's fields-of-interest to filter out unwanted information from ical strings sent over the bus. @@ -1657,7 +1657,7 @@

component :

-the newly created ECalComponent +the newly created ECalComponent @@ -1669,13 +1669,13 @@

e_cal_backend_notify_component_modified ()

void                e_cal_backend_notify_component_modified
                                                         (ECalBackend *backend,
-                                                         ECalComponent *old_component,
-                                                         ECalComponent *new_component);
+ ECalComponent *old_component, + ECalComponent *new_component);

Notifies each of the backend's listeners about a modified object.

-Like e_cal_backend_notify_object_modified() except takes an ECalComponent +Like e_cal_backend_notify_object_modified() except takes an ECalComponent instead of an ical string representation and uses the EDataCalView's fields-of-interest to filter out unwanted information from ical strings sent over the bus. @@ -1690,11 +1690,11 @@

old_component :

-the ECalComponent before the modification +the ECalComponent before the modification

new_component :

-the ECalComponent after the modification +the ECalComponent after the modification @@ -1705,14 +1705,14 @@

e_cal_backend_notify_component_removed ()

void                e_cal_backend_notify_component_removed
                                                         (ECalBackend *backend,
-                                                         const ECalComponentId *id,
-                                                         ECalComponent *old_component,
-                                                         ECalComponent *new_component);
+ const ECalComponentId *id, + ECalComponent *old_component, + ECalComponent *new_component);

Notifies each of the backend's listeners about a removed object.

-Like e_cal_backend_notify_object_removed() except takes an ECalComponent +Like e_cal_backend_notify_object_removed() except takes an ECalComponent instead of an ical string representation and uses the EDataCalView's fields-of-interest to filter out unwanted information from ical strings sent over the bus. @@ -1842,7 +1842,7 @@

e_cal_backend_notify_object_removed ()

void                e_cal_backend_notify_object_removed (ECalBackend *backend,
-                                                         const ECalComponentId *id,
+                                                         const ECalComponentId *id,
                                                          const gchar *old_object,
                                                          const gchar *new_object);
@@ -1972,7 +1972,7 @@

e_cal_backend_notify_auth_required ()

void                e_cal_backend_notify_auth_required  (ECalBackend *backend,
                                                          gboolean is_self,
-                                                         const ECredentials *credentials);
+ const ECredentials *credentials);

Notifies clients that backend requires authentication in order to connect. This function call does not influence 'opening', but @@ -2004,7 +2004,7 @@

credentials :

-an ECredentials that contains extra information for +an ECredentials that contains extra information for a source for which authentication is requested. This parameter can be NULL to indicate "for this calendar". diff -Nru evolution-data-server-3.4.3/docs/reference/calendar/libedata-cal/html/ECalBackendSExp.html evolution-data-server-3.4.4/docs/reference/calendar/libedata-cal/html/ECalBackendSExp.html --- evolution-data-server-3.4.3/docs/reference/calendar/libedata-cal/html/ECalBackendSExp.html 2012-06-18 00:51:11.000000000 +0200 +++ evolution-data-server-3.4.4/docs/reference/calendar/libedata-cal/html/ECalBackendSExp.html 2012-08-13 01:33:54.000000000 +0200 @@ -43,30 +43,30 @@ const gchar *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, gint argc, - ESExpResult **argv, + ESExpResult **argv, gpointer data); -ESExpResult * e_cal_backend_sexp_func_make_time (ESExp *esexp, +ESExpResult * e_cal_backend_sexp_func_make_time (ESExp *esexp, gint argc, - ESExpResult **argv, + ESExpResult **argv, gpointer data); -ESExpResult * e_cal_backend_sexp_func_time_add_day - (ESExp *esexp, +ESExpResult * e_cal_backend_sexp_func_time_add_day + (ESExp *esexp, gint argc, - ESExpResult **argv, + ESExpResult **argv, gpointer data); -ESExpResult * e_cal_backend_sexp_func_time_day_begin - (ESExp *esexp, +ESExpResult * e_cal_backend_sexp_func_time_day_begin + (ESExp *esexp, gint argc, - ESExpResult **argv, + ESExpResult **argv, gpointer data); -ESExpResult * e_cal_backend_sexp_func_time_day_end - (ESExp *esexp, +ESExpResult * e_cal_backend_sexp_func_time_day_end + (ESExp *esexp, gint argc, - ESExpResult **argv, + ESExpResult **argv, gpointer data); gboolean e_cal_backend_sexp_evaluate_occur_times (ECalBackendSExp *sexp, @@ -118,7 +118,7 @@

sexp :

-An ESExp object. +An ESExp object.

object :

@@ -139,7 +139,7 @@

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. @@ -149,7 +149,7 @@

sexp :

-An ESExp object. +An ESExp object.

comp :

@@ -169,9 +169,9 @@

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,
                                                          gint argc,
-                                                         ESExpResult **argv,
+                                                         ESExpResult **argv,
                                                          gpointer data);

 

 Processes the (time-now) sexp expression.
@@ -181,7 +181,7 @@
 
 
 
esexp :

-An ESExp object.
+An ESExp object.
 
 
 
argc :

@@ -205,9 +205,9 @@
 

 

 
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,
                                                          gint argc,
-                                                         ESExpResult **argv,
+                                                         ESExpResult **argv,
                                                          gpointer data);

 

 (make-time ISODATE)
@@ -221,7 +221,7 @@
 
 
 
esexp :

-An ESExp object.
+An ESExp object.
 
 
 
argc :

@@ -245,10 +245,10 @@
 

 

 
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,
                                                          gint argc,
-                                                         ESExpResult **argv,
+                                                         ESExpResult **argv,
                                                          gpointer data);

 

 (time-add-day TIME N)
@@ -267,7 +267,7 @@
 
 
 
esexp :

-An ESExp object.
+An ESExp object.
 
 
 
argc :

@@ -291,10 +291,10 @@
 

 

 
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,
                                                          gint argc,
-                                                         ESExpResult **argv,
+                                                         ESExpResult **argv,
                                                          gpointer data);

 

 (time-day-begin TIME)
@@ -311,7 +311,7 @@
 
 
 
esexp :

-An ESExp object.
+An ESExp object.
 
 
 
argc :

@@ -335,10 +335,10 @@
 

 

 
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,
                                                          gint argc,
-                                                         ESExpResult **argv,
+                                                         ESExpResult **argv,
                                                          gpointer data);

 

 (time-day-end TIME)
@@ -355,7 +355,7 @@
 
 
 
esexp :

-An ESExp object.
+An ESExp object.
 
 
 
argc :

@@ -391,7 +391,7 @@
 
 
 
sexp :

-An ESExp object.
+An ESExp object.
 
 
 
start :

diff -Nru evolution-data-server-3.4.3/docs/reference/calendar/libedata-cal/html/ECalBackendSync.html evolution-data-server-3.4.4/docs/reference/calendar/libedata-cal/html/ECalBackendSync.html
--- evolution-data-server-3.4.3/docs/reference/calendar/libedata-cal/html/ECalBackendSync.html	2012-06-18 00:51:11.000000000 +0200
+++ evolution-data-server-3.4.4/docs/reference/calendar/libedata-cal/html/ECalBackendSync.html	2012-08-13 01:33:54.000000000 +0200
@@ -95,24 +95,24 @@
                                                          GCancellable *cancellable,
                                                          const gchar *calobj,
                                                          gchar **uid,
-                                                         ECalComponent **new_component,
+                                                         ECalComponent **new_component,
                                                          GError **error);
 void                e_cal_backend_sync_modify_object    (ECalBackendSync *backend,
                                                          EDataCal *cal,
                                                          GCancellable *cancellable,
                                                          const gchar *calobj,
-                                                         CalObjModType mod,
-                                                         ECalComponent **old_component,
-                                                         ECalComponent **new_component,
+                                                         CalObjModType mod,
+                                                         ECalComponent **old_component,
+                                                         ECalComponent **new_component,
                                                          GError **error);
 void                e_cal_backend_sync_remove_object    (ECalBackendSync *backend,
                                                          EDataCal *cal,
                                                          GCancellable *cancellable,
                                                          const gchar *uid,
                                                          const gchar *rid,
-                                                         CalObjModType mod,
-                                                         ECalComponent **old_component,
-                                                         ECalComponent **new_component,
+                                                         CalObjModType mod,
+                                                         ECalComponent **old_component,
+                                                         ECalComponent **new_component,
                                                          GError **error);
 void                e_cal_backend_sync_receive_objects  (ECalBackendSync *backend,
                                                          EDataCal *cal,
@@ -155,7 +155,7 @@
 void                e_cal_backend_sync_authenticate_user
                                                         (ECalBackendSync *backend,
                                                          GCancellable *cancellable,
-                                                         ECredentials *credentials,
+                                                         ECredentials *credentials,
                                                          GError **error);
 

 

@@ -163,7 +163,7 @@
 
Object Hierarchy

 
   GObject
-   +----EBackend
+   +----EBackend
          +----ECalBackend
                +----ECalBackendSync
 

@@ -555,7 +555,7 @@
                                                          GCancellable *cancellable,
                                                          const gchar *calobj,
                                                          gchar **uid,
-                                                         ECalComponent **new_component,
+                                                         ECalComponent **new_component,
                                                          GError **error);

 

 Calls the create_object_sync method on the given backend.
@@ -585,7 +585,7 @@
 
 
 
new_component :

-Placeholder for returned ECalComponent. [out][transfer full]
+Placeholder for returned ECalComponent. [out][transfer full]
 
 
 
@@ -602,9 +602,9 @@
                                                          EDataCal *cal,
                                                          GCancellable *cancellable,
                                                          const gchar *calobj,
-                                                         CalObjModType mod,
-                                                         ECalComponent **old_component,
-                                                         ECalComponent **new_component,
+                                                         CalObjModType mod,
+                                                         ECalComponent **old_component,
+                                                         ECalComponent **new_component,
                                                          GError **error);

 

 Calls the modify_object_sync method on the given backend.
@@ -659,9 +659,9 @@
                                                          GCancellable *cancellable,
                                                          const gchar *uid,
                                                          const gchar *rid,
-                                                         CalObjModType mod,
-                                                         ECalComponent **old_component,
-                                                         ECalComponent **new_component,
+                                                         CalObjModType mod,
+                                                         ECalComponent **old_component,
+                                                         ECalComponent **new_component,
                                                          GError **error);

 

 Calls the remove_object_sync method on the given backend.
@@ -985,7 +985,7 @@
 
void                e_cal_backend_sync_authenticate_user
                                                         (ECalBackendSync *backend,
                                                          GCancellable *cancellable,
-                                                         ECredentials *credentials,
+                                                         ECredentials *credentials,
                                                          GError **error);

 

 Authenticates backend with given credentials.
@@ -1004,7 +1004,7 @@
 
 
 
credentials :

-an ECredentials to authenticate with
+an ECredentials to authenticate with
 
 
 
error :

diff -Nru evolution-data-server-3.4.3/docs/reference/calendar/libedata-cal/html/EDataCal.html evolution-data-server-3.4.4/docs/reference/calendar/libedata-cal/html/EDataCal.html
--- evolution-data-server-3.4.3/docs/reference/calendar/libedata-cal/html/EDataCal.html	2012-06-18 00:51:11.000000000 +0200
+++ evolution-data-server-3.4.4/docs/reference/calendar/libedata-cal/html/EDataCal.html	2012-08-13 01:33:54.000000000 +0200
@@ -92,18 +92,18 @@
                                                          guint32 opid,
                                                          GError *error,
                                                          const gchar *uid,
-                                                         ECalComponent *new_component);
+                                                         ECalComponent *new_component);
 void                e_data_cal_respond_modify_object    (EDataCal *cal,
                                                          guint32 opid,
                                                          GError *error,
-                                                         ECalComponent *old_component,
-                                                         ECalComponent *new_component);
+                                                         ECalComponent *old_component,
+                                                         ECalComponent *new_component);
 void                e_data_cal_respond_remove_object    (EDataCal *cal,
                                                          guint32 opid,
                                                          GError *error,
-                                                         const ECalComponentId *id,
-                                                         ECalComponent *old_component,
-                                                         ECalComponent *new_component);
+                                                         const ECalComponentId *id,
+                                                         ECalComponent *old_component,
+                                                         ECalComponent *new_component);
 void                e_data_cal_respond_receive_objects  (EDataCal *cal,
                                                          guint32 opid,
                                                          GError *error);
@@ -138,7 +138,7 @@
 void                e_data_cal_report_online            (EDataCal *cal,
                                                          gboolean is_online);
 void                e_data_cal_report_auth_required     (EDataCal *cal,
-                                                         const ECredentials *credentials);
+                                                         const ECredentials *credentials);
 void                e_data_cal_report_opened            (EDataCal *cal,
                                                          const GError *error);
 void                e_data_cal_report_free_busy_data    (EDataCal *cal,
@@ -478,7 +478,7 @@
                                                          guint32 opid,
                                                          GError *error,
                                                          const gchar *uid,
-                                                         ECalComponent *new_component);
+ ECalComponent *new_component);

Notifies listeners of the completion of the create_object method call.

@@ -499,7 +499,7 @@

new_component :

-The newly created ECalComponent. +The newly created ECalComponent.
@@ -511,8 +511,8 @@ 
void                e_data_cal_respond_modify_object    (EDataCal *cal,
                                                          guint32 opid,
                                                          GError *error,
-                                                         ECalComponent *old_component,
-                                                         ECalComponent *new_component);
+ ECalComponent *old_component, + ECalComponent *new_component);

Notifies listeners of the completion of the modify_object method call.

@@ -529,11 +529,11 @@

old_component :

-The old ECalComponent. +The old ECalComponent.

new_component :

-The new ECalComponent. +The new ECalComponent.
@@ -545,9 +545,9 @@ 
void                e_data_cal_respond_remove_object    (EDataCal *cal,
                                                          guint32 opid,
                                                          GError *error,
-                                                         const ECalComponentId *id,
-                                                         ECalComponent *old_component,
-                                                         ECalComponent *new_component);
+ const ECalComponentId *id, + ECalComponent *old_component, + ECalComponent *new_component);

Notifies listeners of the completion of the remove_object method call.

@@ -568,11 +568,11 @@

old_component :

-The old ECalComponent. +The old ECalComponent.

new_component :

-The new ECalComponent. This will not be NULL only +The new ECalComponent. This will not be NULL only when removing instances of a recurring appointment. @@ -807,7 +807,7 @@

e_data_cal_report_auth_required ()

void                e_data_cal_report_auth_required     (EDataCal *cal,
-                                                         const ECredentials *credentials);
+ const ECredentials *credentials);

FIXME: Document me.

diff -Nru evolution-data-server-3.4.3/docs/reference/calendar/libedata-cal/html/libedata-cal-ECalBackendStore.html evolution-data-server-3.4.4/docs/reference/calendar/libedata-cal/html/libedata-cal-ECalBackendStore.html --- evolution-data-server-3.4.3/docs/reference/calendar/libedata-cal/html/libedata-cal-ECalBackendStore.html 2012-06-18 00:51:11.000000000 +0200 +++ evolution-data-server-3.4.4/docs/reference/calendar/libedata-cal/html/libedata-cal-ECalBackendStore.html 2012-08-13 01:33:54.000000000 +0200 @@ -43,16 +43,16 @@ gboolean e_cal_backend_store_is_loaded (ECalBackendStore *store); gboolean e_cal_backend_store_remove (ECalBackendStore *store); gboolean e_cal_backend_store_clean (ECalBackendStore *store); -ECalComponent * e_cal_backend_store_get_component (ECalBackendStore *store, +ECalComponent * e_cal_backend_store_get_component (ECalBackendStore *store, const gchar *uid, const gchar *rid); gboolean e_cal_backend_store_put_component_with_time_range (ECalBackendStore *store, - ECalComponent *comp, + ECalComponent *comp, time_t occurence_start, time_t occurence_end); gboolean e_cal_backend_store_put_component (ECalBackendStore *store, - ECalComponent *comp); + ECalComponent *comp); gboolean e_cal_backend_store_remove_component (ECalBackendStore *store, const gchar *uid, @@ -90,7 +90,7 @@ void e_cal_backend_store_freeze_changes (ECalBackendStore *store); void e_cal_backend_store_interval_tree_add_comp (ECalBackendStore *store, - ECalComponent *comp, + ECalComponent *comp, time_t start, time_t end); @@ -141,7 +141,7 @@

e_cal_backend_store_get_component ()

-
ECalComponent *     e_cal_backend_store_get_component   (ECalBackendStore *store,
+
ECalComponent *     e_cal_backend_store_get_component   (ECalBackendStore *store,
                                                          const gchar *uid,
                                                          const gchar *rid);

 
Since 2.28

@@ -151,7 +151,7 @@
 
e_cal_backend_store_put_component_with_time_range ()

 
gboolean            e_cal_backend_store_put_component_with_time_range
                                                         (ECalBackendStore *store,
-                                                         ECalComponent *comp,
+                                                         ECalComponent *comp,
                                                          time_t occurence_start,
                                                          time_t occurence_end);

 
Since 2.32

@@ -160,7 +160,7 @@
 

 
e_cal_backend_store_put_component ()

 
gboolean            e_cal_backend_store_put_component   (ECalBackendStore *store,
-                                                         ECalComponent *comp);

+                                                         ECalComponent *comp);

Since 2.28

@@ -251,7 +251,7 @@

Returns :

A list of 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.
@@ -296,7 +296,7 @@

e_cal_backend_store_interval_tree_add_comp ()

void                e_cal_backend_store_interval_tree_add_comp
                                                         (ECalBackendStore *store,
-                                                         ECalComponent *comp,
+                                                         ECalComponent *comp,
                                                          time_t start,
                                                          time_t end);

Since 2.32

diff -Nru evolution-data-server-3.4.3/docs/reference/calendar/libedata-cal/html/libedata-cal-EDataCalFactory.html evolution-data-server-3.4.4/docs/reference/calendar/libedata-cal/html/libedata-cal-EDataCalFactory.html --- evolution-data-server-3.4.3/docs/reference/calendar/libedata-cal/html/libedata-cal-EDataCalFactory.html 2012-06-18 00:51:11.000000000 +0200 +++ evolution-data-server-3.4.4/docs/reference/calendar/libedata-cal/html/libedata-cal-EDataCalFactory.html 2012-08-13 01:33:54.000000000 +0200 @@ -38,7 +38,7 @@

Synopsis

struct              EDataCalFactory;
-EDBusServer *       e_data_cal_factory_new              (GCancellable *cancellable,
+EDBusServer *       e_data_cal_factory_new              (GCancellable *cancellable,
                                                          GError **error);
@@ -58,7 +58,7 @@

e_data_cal_factory_new ()

-
EDBusServer *       e_data_cal_factory_new              (GCancellable *cancellable,
+
EDBusServer *       e_data_cal_factory_new              (GCancellable *cancellable,
                                                          GError **error);
diff -Nru evolution-data-server-3.4.3/docs/reference/calendar/libedata-cal/html/libedata-cal-EDataCalView.html evolution-data-server-3.4.4/docs/reference/calendar/libedata-cal/html/libedata-cal-EDataCalView.html --- evolution-data-server-3.4.3/docs/reference/calendar/libedata-cal/html/libedata-cal-EDataCalView.html 2012-06-18 00:51:11.000000000 +0200 +++ evolution-data-server-3.4.4/docs/reference/calendar/libedata-cal/html/libedata-cal-EDataCalView.html 2012-08-13 01:33:54.000000000 +0200 @@ -49,7 +49,7 @@ gboolean e_data_cal_view_object_matches (EDataCalView *view, const gchar *object); gboolean e_data_cal_view_component_matches (EDataCalView *view, - ECalComponent *component); + ECalComponent *component); gboolean e_data_cal_view_is_started (EDataCalView *view); gboolean e_data_cal_view_is_completed (EDataCalView *view); gboolean e_data_cal_view_is_stopped (EDataCalView *view); @@ -57,19 +57,19 @@ (EDataCalView *view); gchar * e_data_cal_view_get_component_string (EDataCalView *view, - ECalComponent *component); + ECalComponent *component); void e_data_cal_view_notify_components_added (EDataCalView *view, const GSList *ecalcomponents); void e_data_cal_view_notify_components_added_1 (EDataCalView *view, - ECalComponent *component); + ECalComponent *component); void e_data_cal_view_notify_components_modified (EDataCalView *view, const GSList *ecalcomponents); void e_data_cal_view_notify_components_modified_1 (EDataCalView *view, - ECalComponent *component); + ECalComponent *component); void e_data_cal_view_notify_objects_added (EDataCalView *view, const GSList *objects); @@ -87,7 +87,7 @@ const GSList *ids); void e_data_cal_view_notify_objects_removed_1 (EDataCalView *view, - const ECalComponentId *id); + const ECalComponentId *id); void e_data_cal_view_notify_progress (EDataCalView *view, gint percent, const gchar *message); @@ -188,7 +188,7 @@

e_data_cal_view_component_matches ()

gboolean            e_data_cal_view_component_matches   (EDataCalView *view,
-                                                         ECalComponent *component);
+ ECalComponent *component);

Compares the given component to the regular expression used for the given view. @@ -202,7 +202,7 @@

component :

-the ECalComponent object to match. +the ECalComponent object to match.

Returns :

@@ -310,9 +310,9 @@

e_data_cal_view_get_component_string ()

gchar *             e_data_cal_view_get_component_string
                                                         (EDataCalView *view,
-                                                         ECalComponent *component);
+ ECalComponent *component);

-This function is similar to e_cal_component_get_as_string() except +This function is similar to e_cal_component_get_as_string() except that it takes into account the fields-of-interest that view is configured with and filters out any unneeded fields.

@@ -325,7 +325,7 @@

component :

-The ECalComponent to get the string for. +The ECalComponent to get the string for.

Returns :

@@ -372,12 +372,12 @@

e_data_cal_view_notify_components_added_1 ()

void                e_data_cal_view_notify_components_added_1
                                                         (EDataCalView *view,
-                                                         ECalComponent *component);
+ ECalComponent *component);

Notifies all the view listeners of the addition of a single object.

-Like e_data_cal_view_notify_objects_added_1() except takes an ECalComponent +Like e_data_cal_view_notify_objects_added_1() except takes an ECalComponent instead of an ical string representation and uses the EDataCalView's fields-of-interest to filter out unwanted information from ical strings sent over the bus. @@ -391,7 +391,7 @@

component :

-The ECalComponent that has been added. +The ECalComponent that has been added.
@@ -408,7 +408,7 @@

Like e_data_cal_view_notify_objects_modified() except takes a list of -ECalComponents instead of a ical string representations and uses the +ECalComponents instead of a ical string representations and uses the EDataCalView's fields-of-interest to filter out unwanted information from ical strings sent over the bus.

@@ -432,13 +432,13 @@

e_data_cal_view_notify_components_modified_1 ()

void                e_data_cal_view_notify_components_modified_1
                                                         (EDataCalView *view,
-                                                         ECalComponent *component);
+ ECalComponent *component);

Notifies all view listeners of the modification of component.

Like e_data_cal_view_notify_objects_modified_1() except takes an -ECalComponent instead of an ical string representation and uses the +ECalComponent instead of an ical string representation and uses the EDataCalView's fields-of-interest to filter out unwanted information from ical strings sent over the bus.

@@ -451,7 +451,7 @@

component :

-The modified ECalComponent. +The modified ECalComponent.
@@ -597,7 +597,7 @@

e_data_cal_view_notify_objects_removed_1 ()

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

Notifies all view listener of the removal of a single object.

diff -Nru evolution-data-server-3.4.3/docs/reference/calendar/libedata-cal/html/libedata-cal-EIntervalTree.html evolution-data-server-3.4.4/docs/reference/calendar/libedata-cal/html/libedata-cal-EIntervalTree.html --- evolution-data-server-3.4.3/docs/reference/calendar/libedata-cal/html/libedata-cal-EIntervalTree.html 2012-06-18 00:51:11.000000000 +0200 +++ evolution-data-server-3.4.4/docs/reference/calendar/libedata-cal/html/libedata-cal-EIntervalTree.html 2012-08-13 01:33:54.000000000 +0200 @@ -42,7 +42,7 @@ gboolean e_intervaltree_insert (EIntervalTree *tree, time_t start, time_t end, - ECalComponent *comp); + ECalComponent *comp); gboolean e_intervaltree_remove (EIntervalTree *tree, const gchar *uid, const gchar *rid); @@ -88,7 +88,7 @@ 
gboolean            e_intervaltree_insert               (EIntervalTree *tree,
                                                          time_t start,
                                                          time_t end,
-                                                         ECalComponent *comp);
+ ECalComponent *comp);
diff -Nru evolution-data-server-3.4.3/docs/reference/calendar/libedata-cal/Makefile.in evolution-data-server-3.4.4/docs/reference/calendar/libedata-cal/Makefile.in --- evolution-data-server-3.4.3/docs/reference/calendar/libedata-cal/Makefile.in 2012-06-18 00:11:12.000000000 +0200 +++ evolution-data-server-3.4.4/docs/reference/calendar/libedata-cal/Makefile.in 2012-08-12 23:32:36.000000000 +0200 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.5 from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, diff -Nru evolution-data-server-3.4.3/docs/reference/calendar/Makefile.in evolution-data-server-3.4.4/docs/reference/calendar/Makefile.in --- evolution-data-server-3.4.3/docs/reference/calendar/Makefile.in 2012-06-18 00:11:12.000000000 +0200 +++ evolution-data-server-3.4.4/docs/reference/calendar/Makefile.in 2012-08-12 23:32:36.000000000 +0200 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.5 from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, diff -Nru evolution-data-server-3.4.3/docs/reference/camel/html/camel-camel-mime-utils.html evolution-data-server-3.4.4/docs/reference/camel/html/camel-camel-mime-utils.html --- evolution-data-server-3.4.3/docs/reference/camel/html/camel-camel-mime-utils.html 2012-06-18 00:51:11.000000000 +0200 +++ evolution-data-server-3.4.4/docs/reference/camel/html/camel-camel-mime-utils.html 2012-08-13 01:33:55.000000000 +0200 @@ -282,7 +282,7 @@ - + @@ -313,7 +313,7 @@ - + diff -Nru evolution-data-server-3.4.3/docs/reference/camel/html/index.html evolution-data-server-3.4.4/docs/reference/camel/html/index.html --- evolution-data-server-3.4.3/docs/reference/camel/html/index.html 2012-06-18 00:51:12.000000000 +0200 +++ evolution-data-server-3.4.4/docs/reference/camel/html/index.html 2012-08-13 01:33:55.000000000 +0200 @@ -17,7 +17,7 @@

tm :

the tm to convert to a calendar time representationthe tm to convert to a calendar time representation

Returns :

tm :

the tm to store the result inthe tm to store the result in

offset :

Copyright © 2000-2008 Novell, Inc.

-

Permission is granted to make and distribute verbatim +

Permission is granted to make and distribute verbatim copies of this manual provided the copyright notice and this permission notice are preserved on all copies.

Permission is granted to copy and distribute modified diff -Nru evolution-data-server-3.4.3/docs/reference/camel/Makefile.in evolution-data-server-3.4.4/docs/reference/camel/Makefile.in --- evolution-data-server-3.4.3/docs/reference/camel/Makefile.in 2012-06-18 00:11:12.000000000 +0200 +++ evolution-data-server-3.4.4/docs/reference/camel/Makefile.in 2012-08-12 23:32:37.000000000 +0200 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.5 from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, diff -Nru evolution-data-server-3.4.3/docs/reference/libebackend/html/ch01.html evolution-data-server-3.4.4/docs/reference/libebackend/html/ch01.html --- evolution-data-server-3.4.3/docs/reference/libebackend/html/ch01.html 2012-06-18 00:51:13.000000000 +0200 +++ evolution-data-server-3.4.4/docs/reference/libebackend/html/ch01.html 2012-08-13 01:33:56.000000000 +0200 @@ -21,7 +21,7 @@

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

+Evolution-Data-Server Manual: Backend Utilities (libebackend)
EBackend — an abstract base class for backends diff -Nru evolution-data-server-3.4.3/docs/reference/libebackend/html/EBackendFactory.html evolution-data-server-3.4.4/docs/reference/libebackend/html/EBackendFactory.html --- evolution-data-server-3.4.3/docs/reference/libebackend/html/EBackendFactory.html 2012-06-18 00:51:13.000000000 +0200 +++ evolution-data-server-3.4.4/docs/reference/libebackend/html/EBackendFactory.html 2012-08-13 01:33:56.000000000 +0200 @@ -45,7 +45,7 @@ struct EBackendFactory; const gchar * e_backend_factory_get_hash_key (EBackendFactory *factory); EBackend * e_backend_factory_new_backend (EBackendFactory *factory, - ESource *source); + ESource *source);
@@ -60,7 +60,7 @@

Description

An EBackendFactory's job is to create an EBackend instance for a -given ESource. EBackendFactory and EBackend should be subclassed +given ESource. EBackendFactory and EBackend should be subclassed together, so that each type of EBackendFactory creates a unique type of EBackend.

@@ -68,9 +68,9 @@ Each EBackendFactory subclass must define a hash key to uniquely identify itself among other EBackendFactory subclasses. EDataFactory then services incoming connection requests by deriving a hash key from -the requested ESource, using the dervied hash key to find an appropriate +the requested ESource, using the dervied hash key to find an appropriate EBackendFactory, and creating an EBackend instance from that factory -to pair with the requested ESource. +to pair with the requested ESource.

@@ -111,7 +111,7 @@

e_backend_factory_new_backend ()

EBackend *          e_backend_factory_new_backend       (EBackendFactory *factory,
-                                                         ESource *source);
+ ESource *source);

Returns a new EBackend instance for source.

@@ -125,7 +125,7 @@

source :

-an ESource +an ESource diff -Nru evolution-data-server-3.4.3/docs/reference/libebackend/html/EBackend.html evolution-data-server-3.4.4/docs/reference/libebackend/html/EBackend.html --- evolution-data-server-3.4.3/docs/reference/libebackend/html/EBackend.html 2012-06-18 00:51:13.000000000 +0200 +++ evolution-data-server-3.4.4/docs/reference/libebackend/html/EBackend.html 2012-08-13 01:33:56.000000000 +0200 @@ -50,7 +50,7 @@ gboolean e_backend_get_online (EBackend *backend); void e_backend_set_online (EBackend *backend, gboolean online); -ESource * e_backend_get_source (EBackend *backend); +ESource * e_backend_get_source (EBackend *backend); void e_backend_last_client_gone (EBackend *backend);
@@ -65,7 +65,7 @@

Properties

   "online"                   gboolean              : Read / Write / Construct
-  "source"                   ESource*              : Read / Write / Construct Only
+  "source"                   ESource*              : Read / Write / Construct Only
@@ -77,12 +77,12 @@

Description

-An EBackend is paired with an ESource to facilitate performing -actions on the local or remote resource described by the ESource. +An EBackend is paired with an ESource to facilitate performing +actions on the local or remote resource described by the ESource.

In other words, whereas a certain backend type knows how to talk to a -certain type of server or data store, the ESource fills in configuration +certain type of server or data store, the ESource fills in configuration details such as host name, user name, resource path, etc.

@@ -154,9 +154,9 @@

e_backend_get_source ()

-
ESource *           e_backend_get_source                (EBackend *backend);
+
ESource *           e_backend_get_source                (EBackend *backend);

-Returns the ESource to which backend is paired. +Returns the ESource to which backend is paired.

@@ -168,7 +168,7 @@ - +

Returns :

the ESource to which backend is pairedthe ESource to which backend is paired
@@ -206,7 +206,7 @@

The "source" property

-
  "source"                   ESource*              : Read / Write / Construct Only
+
  "source"                   ESource*              : Read / Write / Construct Only

The data source being acted upon.

diff -Nru evolution-data-server-3.4.3/docs/reference/libebackend/html/EDataFactory.html evolution-data-server-3.4.4/docs/reference/libebackend/html/EDataFactory.html --- evolution-data-server-3.4.3/docs/reference/libebackend/html/EDataFactory.html 2012-06-18 00:51:13.000000000 +0200 +++ evolution-data-server-3.4.4/docs/reference/libebackend/html/EDataFactory.html 2012-08-13 01:33:56.000000000 +0200 @@ -49,7 +49,7 @@ struct EDataFactory; EBackend * e_data_factory_get_backend (EDataFactory *factory, const gchar *hash_key, - ESource *source); + ESource *source); gboolean e_data_factory_get_online (EDataFactory *factory); void e_data_factory_set_online (EDataFactory *factory, gboolean online); @@ -94,7 +94,7 @@

e_data_factory_get_backend ()

EBackend *          e_data_factory_get_backend          (EDataFactory *factory,
                                                          const gchar *hash_key,
-                                                         ESource *source);
+ ESource *source);
diff -Nru evolution-data-server-3.4.3/docs/reference/libebackend/html/ix01.html evolution-data-server-3.4.4/docs/reference/libebackend/html/ix01.html --- evolution-data-server-3.4.3/docs/reference/libebackend/html/ix01.html 2012-06-18 00:51:13.000000000 +0200 +++ evolution-data-server-3.4.4/docs/reference/libebackend/html/ix01.html 2012-08-13 01:33:56.000000000 +0200 @@ -21,7 +21,7 @@

-Index

+Index

E

diff -Nru evolution-data-server-3.4.3/docs/reference/libebackend/libebackend-docs.xml evolution-data-server-3.4.4/docs/reference/libebackend/libebackend-docs.xml --- evolution-data-server-3.4.3/docs/reference/libebackend/libebackend-docs.xml 2012-06-18 00:09:40.000000000 +0200 +++ evolution-data-server-3.4.4/docs/reference/libebackend/libebackend-docs.xml 2012-08-12 23:50:37.000000000 +0200 @@ -3,7 +3,7 @@ "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [ ]> - + Evolution-Data-Server Manual: Backend Utilities (libebackend) diff -Nru evolution-data-server-3.4.3/docs/reference/libebackend/Makefile.in evolution-data-server-3.4.4/docs/reference/libebackend/Makefile.in --- evolution-data-server-3.4.3/docs/reference/libebackend/Makefile.in 2012-06-18 00:11:13.000000000 +0200 +++ evolution-data-server-3.4.4/docs/reference/libebackend/Makefile.in 2012-08-12 23:32:37.000000000 +0200 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.5 from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, diff -Nru evolution-data-server-3.4.3/docs/reference/libedataserver/html/ch01.html evolution-data-server-3.4.4/docs/reference/libedataserver/html/ch01.html --- evolution-data-server-3.4.3/docs/reference/libedataserver/html/ch01.html 2012-06-18 00:51:12.000000000 +0200 +++ evolution-data-server-3.4.4/docs/reference/libedataserver/html/ch01.html 2012-08-13 01:33:55.000000000 +0200 @@ -21,7 +21,7 @@

-Evolution-Data-Server Manual: Utilities (libedataserver)

+Evolution-Data-Server Manual: Utilities (libedataserver)
EAccount diff -Nru evolution-data-server-3.4.3/docs/reference/libedataserver/html/libedataserver-Version-Information.html evolution-data-server-3.4.4/docs/reference/libedataserver/html/libedataserver-Version-Information.html --- evolution-data-server-3.4.3/docs/reference/libedataserver/html/libedataserver-Version-Information.html 2012-06-18 00:51:12.000000000 +0200 +++ evolution-data-server-3.4.4/docs/reference/libedataserver/html/libedataserver-Version-Information.html 2012-08-13 01:33:55.000000000 +0200 @@ -168,7 +168,7 @@

EDS_MICRO_VERSION

-
#define EDS_MICRO_VERSION 3
+
#define EDS_MICRO_VERSION 4
 

 

 The micro version number of the Evolution-Data-Server library.  Like
diff -Nru evolution-data-server-3.4.3/docs/reference/libedataserver/Makefile.in evolution-data-server-3.4.4/docs/reference/libedataserver/Makefile.in
--- evolution-data-server-3.4.3/docs/reference/libedataserver/Makefile.in	2012-06-18 00:11:13.000000000 +0200
+++ evolution-data-server-3.4.4/docs/reference/libedataserver/Makefile.in	2012-08-12 23:32:37.000000000 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.5 from Makefile.am.
+# Makefile.in generated by automake 1.11.6 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
diff -Nru evolution-data-server-3.4.3/docs/reference/libedataserverui/html/ch01.html evolution-data-server-3.4.4/docs/reference/libedataserverui/html/ch01.html
--- evolution-data-server-3.4.3/docs/reference/libedataserverui/html/ch01.html	2012-06-18 00:51:12.000000000 +0200
+++ evolution-data-server-3.4.4/docs/reference/libedataserverui/html/ch01.html	2012-08-13 01:33:56.000000000 +0200
@@ -21,7 +21,7 @@
 
 

 

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

+Evolution-Data-Server Manual: Graphical Utilities (libedataserverui)
e-book-auth-util @@ -84,7 +84,6 @@ ETreeModelGenerator
-<xi:include></xi:include>
diff -Nru evolution-data-server-3.4.3/docs/reference/libedataserverui/html/EContactStore.html evolution-data-server-3.4.4/docs/reference/libedataserverui/html/EContactStore.html --- evolution-data-server-3.4.3/docs/reference/libedataserverui/html/EContactStore.html 2012-06-18 00:51:12.000000000 +0200 +++ evolution-data-server-3.4.4/docs/reference/libedataserverui/html/EContactStore.html 2012-08-13 01:33:56.000000000 +0200 @@ -45,21 +45,21 @@

Synopsis

struct              EContactStore;
 EContactStore *     e_contact_store_new                 (void);
-EBookClient *       e_contact_store_get_client          (EContactStore *contact_store,
+EBookClient *       e_contact_store_get_client          (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);
 GSList *            e_contact_store_get_clients         (EContactStore *contact_store);
 void                e_contact_store_add_client          (EContactStore *contact_store,
-                                                         EBookClient *book_client);
+                                                         EBookClient *book_client);
 void                e_contact_store_remove_client       (EContactStore *contact_store,
-                                                         EBookClient *book_client);
+                                                         EBookClient *book_client);
 void                e_contact_store_set_query           (EContactStore *contact_store,
-                                                         EBookQuery *book_query);
-EBookQuery *        e_contact_store_peek_query          (EContactStore *contact_store);
+                                                         EBookQuery *book_query);
+EBookQuery *        e_contact_store_peek_query          (EContactStore *contact_store);
@@ -109,10 +109,10 @@

e_contact_store_get_client ()

-
EBookClient *       e_contact_store_get_client          (EContactStore *contact_store,
+
EBookClient *       e_contact_store_get_client          (EContactStore *contact_store,
                                                          GtkTreeIter *iter);

 

-Gets the EBookClient that provided the contact at iter.
+Gets the EBookClient that provided the contact at iter.
 

 
@@ -129,7 +129,7 @@
 
-
+

 

 

 
Returns :
An EBookClient.An EBookClient.
 

 
 

@@ -138,10 +138,10 @@
 

 

 
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.
 

 
@@ -158,7 +158,7 @@
 
-
+

 

 

 
Returns :
An EContact.An EContact.
 

 
 

@@ -213,7 +213,7 @@
 
 
 
Returns :

-A GSList of pointers to EBookClient. The caller owns the list,
+A GSList of pointers to EBookClient. The caller owns the list,
 but not the book clients.
 
 
@@ -224,7 +224,7 @@
 

 
e_contact_store_add_client ()

 
void                e_contact_store_add_client          (EContactStore *contact_store,
-                                                         EBookClient *book_client);

+                                                         EBookClient *book_client);

 

 Adds book_client to the list of book clients that provide contacts for contact_store.
 The contact_store adds a reference to book_client, if added.
@@ -239,7 +239,7 @@
 
 
 
book_client :

-an EBookClient
+an EBookClient
 
 
 
@@ -250,7 +250,7 @@
 

 
e_contact_store_remove_client ()

 
void                e_contact_store_remove_client       (EContactStore *contact_store,
-                                                         EBookClient *book_client);

+                                                         EBookClient *book_client);

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

@@ -264,7 +264,7 @@

book_client :

-an EBookClient +an EBookClient @@ -275,7 +275,7 @@

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. @@ -290,7 +290,7 @@

book_query :

-an EBookQuery +an EBookQuery @@ -299,7 +299,7 @@

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. @@ -314,7 +314,7 @@

Returns :

-The EBookQuery being used. +The EBookQuery being used.
@@ -325,14 +325,14 @@

The "start-client-view" signal

void                user_function                      (EContactStore   *econtactstore,
-                                                        EBookClientView *arg1,
+                                                        EBookClientView *arg1,
                                                         gpointer         user_data)          : Run Last

The "stop-client-view" signal

void                user_function                      (EContactStore   *econtactstore,
-                                                        EBookClientView *arg1,
+                                                        EBookClientView *arg1,
                                                         gpointer         user_data)          : Run Last
diff -Nru evolution-data-server-3.4.3/docs/reference/libedataserverui/html/EDestinationStore.html evolution-data-server-3.4.4/docs/reference/libedataserverui/html/EDestinationStore.html --- evolution-data-server-3.4.3/docs/reference/libedataserverui/html/EDestinationStore.html 2012-06-18 00:51:12.000000000 +0200 +++ evolution-data-server-3.4.4/docs/reference/libedataserverui/html/EDestinationStore.html 2012-08-13 01:33:56.000000000 +0200 @@ -44,20 +44,20 @@ 
struct              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,
                                                          gint n);
@@ -119,10 +119,10 @@
 

 

 
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.
 

 
@@ -139,7 +139,7 @@
 
-
+

 

 

 
Returns :
An EDestination.An EDestination.
 

 
 

@@ -150,7 +150,7 @@
 
GList *             e_destination_store_list_destinations
                                                         (EDestinationStore *destination_store);

 

-Gets a list of all the EDestinations in destination_store.
+Gets a list of all the EDestinations in destination_store.
 

 
@@ -162,8 +162,8 @@
 
-
+

 

 

 
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.
 

 
 

@@ -174,7 +174,7 @@
 
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.
@@ -193,7 +193,7 @@
 
 
 
destination :

-an EDestination to insert
+an EDestination to insert
 
 
 

@@ -203,7 +203,7 @@
 
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. @@ -218,7 +218,7 @@

destination :

-an EDestination +an EDestination @@ -229,7 +229,7 @@

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. @@ -244,7 +244,7 @@

destination :

-an EDestination to remove +an EDestination to remove
diff -Nru evolution-data-server-3.4.3/docs/reference/libedataserverui/html/ENameSelectorEntry.html evolution-data-server-3.4.4/docs/reference/libedataserverui/html/ENameSelectorEntry.html --- evolution-data-server-3.4.3/docs/reference/libedataserverui/html/ENameSelectorEntry.html 2012-06-18 00:51:13.000000000 +0200 +++ evolution-data-server-3.4.4/docs/reference/libedataserverui/html/ENameSelectorEntry.html 2012-08-13 01:33:56.000000000 +0200 @@ -58,7 +58,7 @@ void e_name_selector_entry_set_destination_store (ENameSelectorEntry *name_selector_entry, EDestinationStore *destination_store); -EDestination * e_name_selector_entry_get_popup_destination +EDestination * e_name_selector_entry_get_popup_destination (ENameSelectorEntry *name_selector_entry); void e_name_selector_entry_set_contact_editor_func (ENameSelectorEntry *name_selector_entry, @@ -236,7 +236,7 @@

e_name_selector_entry_get_popup_destination ()

-
EDestination *      e_name_selector_entry_get_popup_destination
+
EDestination *      e_name_selector_entry_get_popup_destination
                                                         (ENameSelectorEntry *name_selector_entry);

 
Since 2.32
diff -Nru evolution-data-server-3.4.3/docs/reference/libedataserverui/html/ENameSelectorModel.html evolution-data-server-3.4.4/docs/reference/libedataserverui/html/ENameSelectorModel.html --- evolution-data-server-3.4.3/docs/reference/libedataserverui/html/ENameSelectorModel.html 2012-06-18 00:51:13.000000000 +0200 +++ evolution-data-server-3.4.4/docs/reference/libedataserverui/html/ENameSelectorModel.html 2012-08-13 01:33:56.000000000 +0200 @@ -61,7 +61,7 @@ const gchar *name); GList * e_name_selector_model_get_contact_emails_without_used (ENameSelectorModel *name_selector_model, - EContact *contact, + EContact *contact, gboolean remove_used); void e_name_selector_model_free_emails_list (GList *email_list); @@ -273,7 +273,7 @@

e_name_selector_model_get_contact_emails_without_used ()

GList *             e_name_selector_model_get_contact_emails_without_used
                                                         (ENameSelectorModel *name_selector_model,
-                                                         EContact *contact,
+                                                         EContact *contact,
                                                          gboolean remove_used);
diff -Nru evolution-data-server-3.4.3/docs/reference/libedataserverui/html/ESourceComboBox.html evolution-data-server-3.4.4/docs/reference/libedataserverui/html/ESourceComboBox.html --- evolution-data-server-3.4.3/docs/reference/libedataserverui/html/ESourceComboBox.html 2012-06-18 00:51:13.000000000 +0200 +++ evolution-data-server-3.4.4/docs/reference/libedataserverui/html/ESourceComboBox.html 2012-08-13 01:33:56.000000000 +0200 @@ -44,13 +44,13 @@

Synopsis

struct              ESourceComboBox;
-GtkWidget *         e_source_combo_box_new              (ESourceList *source_list);
-ESourceList *       e_source_combo_box_get_source_list  (ESourceComboBox *combo_box);
+GtkWidget *         e_source_combo_box_new              (ESourceList *source_list);
+ESourceList *       e_source_combo_box_get_source_list  (ESourceComboBox *combo_box);
 void                e_source_combo_box_set_source_list  (ESourceComboBox *combo_box,
-                                                         ESourceList *source_list);
-ESource *           e_source_combo_box_get_active       (ESourceComboBox *combo_box);
+                                                         ESourceList *source_list);
+ESource *           e_source_combo_box_get_active       (ESourceComboBox *combo_box);
 void                e_source_combo_box_set_active       (ESourceComboBox *combo_box,
-                                                         ESource *source);
+                                                         ESource *source);
 const gchar *       e_source_combo_box_get_active_uid   (ESourceComboBox *combo_box);
 gboolean            e_source_combo_box_set_active_uid   (ESourceComboBox *combo_box,
                                                          const gchar *uid);
@@ -77,7 +77,7 @@
 

 
Properties

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

 

 

@@ -93,17 +93,17 @@
 

 

 
e_source_combo_box_new ()

-
GtkWidget *         e_source_combo_box_new              (ESourceList *source_list);

+
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.
+Creates a new ESourceComboBox widget that lets the user pick an ESource
+from the provided ESourceList.
- @@ -118,9 +118,9 @@

e_source_combo_box_get_source_list ()

-
ESourceList *       e_source_combo_box_get_source_list  (ESourceComboBox *combo_box);
+
ESourceList *       e_source_combo_box_get_source_list  (ESourceComboBox *combo_box);

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

source_list :

an ESourceList +an ESourceList
@@ -133,7 +133,7 @@ - @@ -144,7 +144,7 @@

e_source_combo_box_set_source_list ()

void                e_source_combo_box_set_source_list  (ESourceComboBox *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. @@ -159,7 +159,7 @@

- @@ -169,9 +169,9 @@

e_source_combo_box_get_active ()

-
ESource *           e_source_combo_box_get_active       (ESourceComboBox *combo_box);
+
ESource *           e_source_combo_box_get_active       (ESourceComboBox *combo_box);

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

Returns :

an ESourceList +an ESourceList

source_list :

an ESourceList +an ESourceList
@@ -184,7 +184,7 @@ - @@ -195,7 +195,7 @@

e_source_combo_box_set_active ()

void                e_source_combo_box_set_active       (ESourceComboBox *combo_box,
-                                                         ESource *source);
+ ESource *source);

Sets the active item to the one corresponding to source.

@@ -209,7 +209,7 @@
- @@ -221,7 +221,7 @@

e_source_combo_box_get_active_uid ()

const gchar *       e_source_combo_box_get_active_uid   (ESourceComboBox *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.

Returns :

an ESource or NULL +an ESource or NULL

source :

an ESource +an ESource
@@ -259,7 +259,7 @@ - @@ -276,7 +276,7 @@

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-3.4.3/docs/reference/libedataserverui/html/ESourceSelectorDialog.html evolution-data-server-3.4.4/docs/reference/libedataserverui/html/ESourceSelectorDialog.html --- evolution-data-server-3.4.3/docs/reference/libedataserverui/html/ESourceSelectorDialog.html 2012-06-18 00:51:13.000000000 +0200 +++ evolution-data-server-3.4.4/docs/reference/libedataserverui/html/ESourceSelectorDialog.html 2012-08-13 01:33:56.000000000 +0200 @@ -43,10 +43,10 @@

Synopsis

struct              ESourceSelectorDialog;
 GtkWidget *         e_source_selector_dialog_new        (GtkWindow *parent,
-                                                         ESourceList *source_list);
+                                                         ESourceList *source_list);
 gboolean            e_source_selector_dialog_select_default_source
                                                         (ESourceSelectorDialog *dialog);
-ESource *           e_source_selector_dialog_peek_primary_selection
+ESource *           e_source_selector_dialog_peek_primary_selection
                                                         (ESourceSelectorDialog *dialog);
@@ -82,7 +82,7 @@

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.

@@ -95,7 +95,7 @@
- @@ -134,7 +134,7 @@

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.
@@ -149,7 +149,7 @@
- diff -Nru evolution-data-server-3.4.3/docs/reference/libedataserverui/html/ESourceSelector.html evolution-data-server-3.4.4/docs/reference/libedataserverui/html/ESourceSelector.html --- evolution-data-server-3.4.3/docs/reference/libedataserverui/html/ESourceSelector.html 2012-06-18 00:51:13.000000000 +0200 +++ evolution-data-server-3.4.4/docs/reference/libedataserverui/html/ESourceSelector.html 2012-08-13 01:33:56.000000000 +0200 @@ -46,17 +46,17 @@

Synopsis

struct              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);
 void                e_source_selector_select_exclusive  (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,
@@ -66,15 +66,15 @@
                                                          gboolean state);
 void                e_source_selector_edit_primary_selection
                                                         (ESourceSelector *selector);
-ESource *           e_source_selector_get_primary_selection
+ESource *           e_source_selector_get_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);
 #define             e_source_selector_peek_primary_selection
-ESource *           e_source_selector_get_source_by_path
+ESource *           e_source_selector_get_source_by_path
                                                         (ESourceSelector *selector,
                                                          GtkTreePath *path);
@@ -99,8 +99,8 @@

Properties

-  "primary-selection"        ESource*              : Read / Write
-  "source-list"              ESourceList*          : Read / Write / Construct Only
+  "primary-selection"        ESource*              : Read / Write
+  "source-list"              ESourceList*          : Read / Write / Construct Only
@@ -124,7 +124,7 @@

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. @@ -146,9 +146,9 @@

e_source_selector_get_source_list ()

-
ESourceList *       e_source_selector_get_source_list   (ESourceSelector *selector);
+
ESourceList *       e_source_selector_get_source_list   (ESourceSelector *selector);

-Returns the ESourceList that selector is rendering. +Returns the ESourceList that selector is rendering.

uid :

a unique ID of an ESource +a unique ID of an ESource

source_list :

an ESourceList +an ESourceList

Returns :

the selected ESource +the selected ESource
@@ -160,7 +160,7 @@ - @@ -171,7 +171,7 @@

e_source_selector_select_source ()

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

Select source in selector.

@@ -184,7 +184,7 @@
- +

Returns :

an ESourceList +an ESourceList

source :

An ESource.An ESource.
@@ -193,7 +193,7 @@

e_source_selector_unselect_source ()

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

Unselect source in selector.

@@ -206,7 +206,7 @@

source :

-An ESource. +An ESource.
@@ -215,7 +215,7 @@

e_source_selector_select_exclusive ()

void                e_source_selector_select_exclusive  (ESourceSelector *selector,
-                                                         ESource *source);
+ ESource *source);

Select source in selector and unselect all others.

@@ -228,7 +228,7 @@

source :

-An ESource. +An ESource.
@@ -239,7 +239,7 @@

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.

@@ -252,7 +252,7 @@

source :

-An ESource. +An ESource.

Returns :

@@ -375,7 +375,7 @@

e_source_selector_get_primary_selection ()

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

 

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

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

+                                                         ESource *source);

Set the primary selected source.

@@ -415,7 +415,7 @@

source :

-an ESource to select +an ESource to select
@@ -423,7 +423,7 @@

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.
@@ -455,11 +455,11 @@
 

 

 
e_source_selector_get_source_by_path ()

-
ESource *           e_source_selector_get_source_by_path
+
ESource *           e_source_selector_get_source_by_path
                                                         (ESourceSelector *selector,
                                                          GtkTreePath *path);

 

-Returns the ESource object at path, or NULL if path is invalid.
+Returns the ESource object at path, or NULL if path is invalid.
 

 
@@ -476,7 +476,7 @@
 
-
@@ -488,13 +488,13 @@
 
Property Details

 
The "primary-selection" property

-
  "primary-selection"        ESource*              : Read / Write

+
  "primary-selection"        ESource*              : Read / Write

 

 

 
The "source-list" property

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

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

 

 

@@ -504,7 +504,7 @@
 
The "data-dropped" signal
gboolean            user_function                      (ESourceSelector  *esourceselector,
                                                         GtkSelectionData *arg1,
-                                                        ESource          *arg2,
+                                                        ESource          *arg2,
                                                         GdkDragAction     arg3,
                                                         guint             arg4,
                                                         gpointer          user_data)            : Run Last

diff -Nru evolution-data-server-3.4.3/docs/reference/libedataserverui/html/libedataserverui-e-book-auth-util.html evolution-data-server-3.4.4/docs/reference/libedataserverui/html/libedataserverui-e-book-auth-util.html
--- evolution-data-server-3.4.3/docs/reference/libedataserverui/html/libedataserverui-e-book-auth-util.html	2012-06-18 00:51:13.000000000 +0200
+++ evolution-data-server-3.4.4/docs/reference/libedataserverui/html/libedataserverui-e-book-auth-util.html	2012-08-13 01:33:56.000000000 +0200
@@ -37,15 +37,15 @@
 

 

 

 
Returns :
the ESource object at path, or NULL
+the ESource object at path, or NULL
 
 

 
 
 
 
 
 

 

 
Synopsis

-
EBook *             e_load_book_source                  (ESource *source,
-                                                         EBookCallback open_func,
+
EBook *             e_load_book_source                  (ESource *source,
+                                                         EBookCallback open_func,
                                                          gpointer user_data);
-void                e_load_book_source_async            (ESource *source,
+void                e_load_book_source_async            (ESource *source,
                                                          GtkWindow *parent,
                                                          GCancellable *cancellable,
                                                          GAsyncReadyCallback callback,
                                                          gpointer user_data);
-EBook *             e_load_book_source_finish           (ESource *source,
+EBook *             e_load_book_source_finish           (ESource *source,
                                                          GAsyncResult *result,
                                                          GError **error);
 

@@ -57,15 +57,15 @@
 
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);

 

 
Warning

 
e_load_book_source has been deprecated since version 3.0 and should not be used in newly-written code. Use e_load_book_source_async() instead.

 

 

-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.
 

@@ -79,7 +79,7 @@
 
 
 
source :

-an ESource
+an ESource
 
 
 
@@ -93,7 +93,7 @@
 
 
 
Returns :

-A new EBook that is being opened.
+A new EBook that is being opened.
 
 
 

@@ -101,7 +101,7 @@
 

 

 
e_load_book_source_async ()

-
void                e_load_book_source_async            (ESource *source,
+
void                e_load_book_source_async            (ESource *source,
                                                          GtkWindow *parent,
                                                          GCancellable *cancellable,
                                                          GAsyncReadyCallback callback,
@@ -111,19 +111,19 @@
 
e_load_book_source_async has been deprecated since version 3.2 and should not be used in newly-written code. Use e_client_utils_open_new(), e_client_utils_open_new_finish() instead.

 

 

-Creates a new EBook specified by source and opens it, prompting the
+Creates a new EBook specified by source and opens it, prompting the
 user for authentication if necessary.
 

 

 When the operation is finished, callback will be called.  You can
-then call e_load_book_source_finish() to obtain the resulting EBook.
+then call e_load_book_source_finish() to obtain the resulting EBook.
 

 

-
@@ -151,7 +151,7 @@
 

 
e_load_book_source_finish ()

-
EBook *             e_load_book_source_finish           (ESource *source,
+
EBook *             e_load_book_source_finish           (ESource *source,
                                                          GAsyncResult *result,
                                                          GError **error);

 

@@ -159,7 +159,7 @@
 
e_load_book_source_finish has been deprecated since version 3.2 and should not be used in newly-written code. Use e_client_utils_open_new(), e_client_utils_open_new_finish() instead.

 

 

-Finishes an asynchronous EBook open operation started with
+Finishes an asynchronous EBook open operation started with
 e_load_book_source_async().  If an error occurred, or the user
 declined to authenticate, the function will return NULL and
 set error.
@@ -169,7 +169,7 @@
 

-
@@ -184,7 +184,7 @@
 
-
+

 
 
 

 
source :
an ESource
+an ESource
 
 

 

 

 

 
source :
an ESource
+an ESource
 
 

 

 

 
Returns :
a ready-to-use EBook, or NULL or errora ready-to-use EBook, or NULL or error
 

 
 

diff -Nru evolution-data-server-3.4.3/docs/reference/libedataserverui/html/libedataserverui-EClient-Utilities.html evolution-data-server-3.4.4/docs/reference/libedataserverui/html/libedataserverui-EClient-Utilities.html
--- evolution-data-server-3.4.3/docs/reference/libedataserverui/html/libedataserverui-EClient-Utilities.html	2012-06-18 00:51:13.000000000 +0200
+++ evolution-data-server-3.4.4/docs/reference/libedataserverui/html/libedataserverui-EClient-Utilities.html	2012-08-13 01:33:56.000000000 +0200
@@ -38,29 +38,29 @@
 

 
Synopsis

 
enum                EClientSourceType;
-gboolean            (*EClientUtilsAuthenticateHandler)  (EClient *client,
-                                                         ECredentials *credentials,
+gboolean            (*EClientUtilsAuthenticateHandler)  (EClient *client,
+                                                         ECredentials *credentials,
                                                          gpointer user_data);
-EClient *           e_client_utils_new                  (ESource *source,
+EClient *           e_client_utils_new                  (ESource *source,
                                                          EClientSourceType source_type,
                                                          GError **error);
-EClient *           e_client_utils_new_from_uri         (const gchar *uri,
+EClient *           e_client_utils_new_from_uri         (const gchar *uri,
                                                          EClientSourceType source_type,
                                                          GError **error);
-EClient *           e_client_utils_new_system           (EClientSourceType source_type,
+EClient *           e_client_utils_new_system           (EClientSourceType source_type,
                                                          GError **error);
-EClient *           e_client_utils_new_default          (EClientSourceType source_type,
+EClient *           e_client_utils_new_default          (EClientSourceType source_type,
                                                          GError **error);
-gboolean            e_client_utils_set_default          (EClient *client,
+gboolean            e_client_utils_set_default          (EClient *client,
                                                          EClientSourceType source_type,
                                                          GError **error);
-gboolean            e_client_utils_set_default_source   (ESource *source,
+gboolean            e_client_utils_set_default_source   (ESource *source,
                                                          EClientSourceType source_type,
                                                          GError **error);
-gboolean            e_client_utils_get_sources          (ESourceList **sources,
+gboolean            e_client_utils_get_sources          (ESourceList **sources,
                                                          EClientSourceType source_type,
                                                          GError **error);
-void                e_client_utils_open_new             (ESource *source,
+void                e_client_utils_open_new             (ESource *source,
                                                          EClientSourceType source_type,
                                                          gboolean only_if_exists,
                                                          GCancellable *cancellable,
@@ -68,18 +68,18 @@
                                                          gpointer auth_handler_user_data,
                                                          GAsyncReadyCallback async_cb,
                                                          gpointer async_cb_user_data);
-gboolean            e_client_utils_open_new_finish      (ESource *source,
+gboolean            e_client_utils_open_new_finish      (ESource *source,
                                                          GAsyncResult *result,
-                                                         EClient **client,
+                                                         EClient **client,
                                                          GError **error);
-gboolean            e_client_utils_authenticate_handler (EClient *client,
-                                                         ECredentials *credentials,
+gboolean            e_client_utils_authenticate_handler (EClient *client,
+                                                         ECredentials *credentials,
                                                          gpointer gtk_window_parent);
-void                e_client_utils_forget_password      (EClient *client);
-gboolean            e_credentials_authenticate_helper   (ECredentials *credentials,
+void                e_client_utils_forget_password      (EClient *client);
+gboolean            e_credentials_authenticate_helper   (ECredentials *credentials,
                                                          GtkWindow *parent,
                                                          gboolean *remember_password);
-void                e_credentials_forget_password       (const ECredentials *credentials);
+void                e_credentials_forget_password       (const ECredentials *credentials);
 

 

 

@@ -102,15 +102,15 @@
 

 

 
EClientUtilsAuthenticateHandler ()

-
gboolean            (*EClientUtilsAuthenticateHandler)  (EClient *client,
-                                                         ECredentials *credentials,
+
gboolean            (*EClientUtilsAuthenticateHandler)  (EClient *client,
+                                                         ECredentials *credentials,
                                                          gpointer user_data);

 
Since 3.2

 

 

 

 
e_client_utils_new ()

-
EClient *           e_client_utils_new                  (ESource *source,
+
EClient *           e_client_utils_new                  (ESource *source,
                                                          EClientSourceType source_type,
                                                          GError **error);

 

@@ -121,7 +121,7 @@
 

 

 
e_client_utils_new_from_uri ()

-
EClient *           e_client_utils_new_from_uri         (const gchar *uri,
+
EClient *           e_client_utils_new_from_uri         (const gchar *uri,
                                                          EClientSourceType source_type,
                                                          GError **error);

 

@@ -132,7 +132,7 @@
 

 

 
e_client_utils_new_system ()

-
EClient *           e_client_utils_new_system           (EClientSourceType source_type,
+
EClient *           e_client_utils_new_system           (EClientSourceType source_type,
                                                          GError **error);

 

 Proxy function for e_book_client_utils_new_system() and e_cal_client_utils_new_system().
@@ -142,7 +142,7 @@
 

 

 
e_client_utils_new_default ()

-
EClient *           e_client_utils_new_default          (EClientSourceType source_type,
+
EClient *           e_client_utils_new_default          (EClientSourceType source_type,
                                                          GError **error);

 

 Proxy function for e_book_client_utils_new_default() and e_cal_client_utils_new_default().
@@ -152,7 +152,7 @@
 

 

 
e_client_utils_set_default ()

-
gboolean            e_client_utils_set_default          (EClient *client,
+
gboolean            e_client_utils_set_default          (EClient *client,
                                                          EClientSourceType source_type,
                                                          GError **error);

 

@@ -163,7 +163,7 @@
 

 

 
e_client_utils_set_default_source ()

-
gboolean            e_client_utils_set_default_source   (ESource *source,
+
gboolean            e_client_utils_set_default_source   (ESource *source,
                                                          EClientSourceType source_type,
                                                          GError **error);

 

@@ -174,7 +174,7 @@
 

 

 
e_client_utils_get_sources ()

-
gboolean            e_client_utils_get_sources          (ESourceList **sources,
+
gboolean            e_client_utils_get_sources          (ESourceList **sources,
                                                          EClientSourceType source_type,
                                                          GError **error);

 

@@ -185,7 +185,7 @@
 

 

 
e_client_utils_open_new ()

-
void                e_client_utils_open_new             (ESource *source,
+
void                e_client_utils_open_new             (ESource *source,
                                                          EClientSourceType source_type,
                                                          gboolean only_if_exists,
                                                          GCancellable *cancellable,
@@ -194,8 +194,8 @@
                                                          GAsyncReadyCallback async_cb,
                                                          gpointer async_cb_user_data);

 

-Begins asynchronous opening of a new EClient corresponding
-to the source of type source_type. The resulting EClient
+Begins asynchronous opening of a new EClient corresponding
+to the source of type source_type. The resulting EClient
 is fully opened and authenticated client, ready to be used.
 The opened client has also fetched capabilities.
 This call is finished by e_client_utils_open_new_finish()
@@ -203,14 +203,14 @@
 

 

 Note: the auth_handler, and its auth_handler_user_data,
-should be valid through whole live of returned EClient.
+should be valid through whole live of returned EClient.
 

 

-
+
@@ -250,13 +250,13 @@
 

 
e_client_utils_open_new_finish ()

-
gboolean            e_client_utils_open_new_finish      (ESource *source,
+
gboolean            e_client_utils_open_new_finish      (ESource *source,
                                                          GAsyncResult *result,
-                                                         EClient **client,
+                                                         EClient **client,
                                                          GError **error);

 

 Finishes previous call of e_client_utils_open_new() and
-sets client to a fully opened and authenticated EClient.
+sets client to a fully opened and authenticated EClient.
 This client, if not NULL, should be freed with g_object_unref().
 

 

 
 
 

 
source :
an ESource to be openedan ESource to be opened
 

 

 
source_type :

 

@@ -264,7 +264,7 @@
 
-
+
@@ -273,7 +273,7 @@
 
-
@@ -293,8 +293,8 @@
 

 
e_client_utils_authenticate_handler ()

-
gboolean            e_client_utils_authenticate_handler (EClient *client,
-                                                         ECredentials *credentials,
+
gboolean            e_client_utils_authenticate_handler (EClient *client,
+                                                         ECredentials *credentials,
                                                          gpointer gtk_window_parent);

 

 This function is suitable as a handler for EClient::authenticate signal.
@@ -311,7 +311,7 @@
 

 

 
e_client_utils_forget_password ()

-
void                e_client_utils_forget_password      (EClient *client);

+
void                e_client_utils_forget_password      (EClient *client);

 

 Forgets stored password for the given client.
 

@@ -319,7 +319,7 @@
 

-

 

 
source :
an ESource on which the e_client_utils_open_new() was invokedan ESource on which the e_client_utils_open_new() was invoked
 

 

 
result :

 

 
client :
Return value for an EClient. [out]
+Return value for an EClient. [out]
 
 

 

 

 

 
client :
An EClient
+An EClient
 
 

 

@@ -328,7 +328,7 @@
 

 

 
e_credentials_authenticate_helper ()

-
gboolean            e_credentials_authenticate_helper   (ECredentials *credentials,
+
gboolean            e_credentials_authenticate_helper   (ECredentials *credentials,
                                                          GtkWindow *parent,
                                                          gboolean *remember_password);

 

@@ -349,7 +349,7 @@
 

 

 
e_credentials_forget_password ()

-
void                e_credentials_forget_password       (const ECredentials *credentials);

+
void                e_credentials_forget_password       (const ECredentials *credentials);

 

 Forgets stored password for given credentials, which should contain
 E_CREDENTIALS_KEY_PROMPT_KEY.
@@ -358,7 +358,7 @@
 
 
 
credentials :

-an ECredentials
+an ECredentials
 
 
 

diff -Nru evolution-data-server-3.4.3/docs/reference/libedataserverui/libedataserverui-docs.sgml evolution-data-server-3.4.4/docs/reference/libedataserverui/libedataserverui-docs.sgml
--- evolution-data-server-3.4.3/docs/reference/libedataserverui/libedataserverui-docs.sgml	2012-06-18 00:09:40.000000000 +0200
+++ evolution-data-server-3.4.4/docs/reference/libedataserverui/libedataserverui-docs.sgml	2012-08-12 23:47:22.000000000 +0200
@@ -19,7 +19,6 @@
     
     
     
-    
     
     
     
diff -Nru evolution-data-server-3.4.3/docs/reference/libedataserverui/Makefile.in evolution-data-server-3.4.4/docs/reference/libedataserverui/Makefile.in
--- evolution-data-server-3.4.3/docs/reference/libedataserverui/Makefile.in	2012-06-18 00:11:13.000000000 +0200
+++ evolution-data-server-3.4.4/docs/reference/libedataserverui/Makefile.in	2012-08-12 23:32:38.000000000 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.5 from Makefile.am.
+# Makefile.in generated by automake 1.11.6 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
diff -Nru evolution-data-server-3.4.3/docs/reference/Makefile.in evolution-data-server-3.4.4/docs/reference/Makefile.in
--- evolution-data-server-3.4.3/docs/reference/Makefile.in	2012-06-18 00:11:10.000000000 +0200
+++ evolution-data-server-3.4.4/docs/reference/Makefile.in	2012-08-12 23:32:35.000000000 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.5 from Makefile.am.
+# Makefile.in generated by automake 1.11.6 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
diff -Nru evolution-data-server-3.4.3/libebackend/Makefile.in evolution-data-server-3.4.4/libebackend/Makefile.in
--- evolution-data-server-3.4.3/libebackend/Makefile.in	2012-06-18 00:11:14.000000000 +0200
+++ evolution-data-server-3.4.4/libebackend/Makefile.in	2012-08-12 23:32:38.000000000 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.5 from Makefile.am.
+# Makefile.in generated by automake 1.11.6 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
diff -Nru evolution-data-server-3.4.3/libedataserver/eds-version.h evolution-data-server-3.4.4/libedataserver/eds-version.h
--- evolution-data-server-3.4.3/libedataserver/eds-version.h	2012-06-18 00:12:06.000000000 +0200
+++ evolution-data-server-3.4.4/libedataserver/eds-version.h	2012-08-12 23:33:31.000000000 +0200
@@ -50,7 +50,7 @@
  * time, rather than from the library linked against at application run
  * time.
  **/
-#define EDS_MICRO_VERSION 3
+#define EDS_MICRO_VERSION 4
 
 /**
  * EDS_CHECK_VERSION:
diff -Nru evolution-data-server-3.4.3/libedataserver/Makefile.in evolution-data-server-3.4.4/libedataserver/Makefile.in
--- evolution-data-server-3.4.3/libedataserver/Makefile.in	2012-06-18 00:11:15.000000000 +0200
+++ evolution-data-server-3.4.4/libedataserver/Makefile.in	2012-08-12 23:32:39.000000000 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.5 from Makefile.am.
+# Makefile.in generated by automake 1.11.6 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
diff -Nru evolution-data-server-3.4.3/libedataserverui/Makefile.in evolution-data-server-3.4.4/libedataserverui/Makefile.in
--- evolution-data-server-3.4.3/libedataserverui/Makefile.in	2012-06-18 00:11:15.000000000 +0200
+++ evolution-data-server-3.4.4/libedataserverui/Makefile.in	2012-08-12 23:32:40.000000000 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.5 from Makefile.am.
+# Makefile.in generated by automake 1.11.6 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
diff -Nru evolution-data-server-3.4.3/ltmain.sh evolution-data-server-3.4.4/ltmain.sh
--- evolution-data-server-3.4.3/ltmain.sh	2012-06-18 00:10:29.000000000 +0200
+++ evolution-data-server-3.4.4/ltmain.sh	2012-08-12 23:31:48.000000000 +0200
@@ -70,7 +70,7 @@
 #         compiler:		$LTCC
 #         compiler flags:		$LTCFLAGS
 #         linker:		$LD (gnu? $with_gnu_ld)
-#         $progname:	(GNU libtool) 2.4.2 Debian-2.4.2-1
+#         $progname:	(GNU libtool) 2.4.2 Debian-2.4.2-1.1
 #         automake:	$automake_version
 #         autoconf:	$autoconf_version
 #
@@ -80,7 +80,7 @@
 
 PROGRAM=libtool
 PACKAGE=libtool
-VERSION="2.4.2 Debian-2.4.2-1"
+VERSION="2.4.2 Debian-2.4.2-1.1"
 TIMESTAMP=""
 package_revision=1.3337
 
diff -Nru evolution-data-server-3.4.3/m4/libtool.m4 evolution-data-server-3.4.4/m4/libtool.m4
--- evolution-data-server-3.4.3/m4/libtool.m4	2012-06-18 00:10:29.000000000 +0200
+++ evolution-data-server-3.4.4/m4/libtool.m4	2012-08-12 23:31:48.000000000 +0200
@@ -2512,17 +2512,6 @@
   esac
   ;;
 
-gnu*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  ;;
-
 haiku*)
   version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
@@ -2639,7 +2628,7 @@
   ;;
 
 # This must be glibc/ELF.
-linux* | k*bsd*-gnu | kopensolaris*-gnu)
+linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
   version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
@@ -3255,10 +3244,6 @@
   fi
   ;;
 
-gnu*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
 haiku*)
   lt_cv_deplibs_check_method=pass_all
   ;;
@@ -3297,7 +3282,7 @@
   ;;
 
 # This must be glibc/ELF.
-linux* | k*bsd*-gnu | kopensolaris*-gnu)
+linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
   lt_cv_deplibs_check_method=pass_all
   ;;
 
@@ -4049,7 +4034,7 @@
 	    ;;
 	esac
 	;;
-      linux* | k*bsd*-gnu | kopensolaris*-gnu)
+      linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
 	case $cc_basename in
 	  KCC*)
 	    # KAI C++ Compiler
@@ -4348,7 +4333,7 @@
       _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
       ;;
 
-    linux* | k*bsd*-gnu | kopensolaris*-gnu)
+    linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
       case $cc_basename in
       # old Intel for x86_64 which still supported -KPIC.
       ecc*)
@@ -6241,9 +6226,6 @@
         _LT_TAGVAR(ld_shlibs, $1)=yes
         ;;
 
-      gnu*)
-        ;;
-
       haiku*)
         _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
         _LT_TAGVAR(link_all_deplibs, $1)=yes
@@ -6405,7 +6387,7 @@
         _LT_TAGVAR(inherit_rpath, $1)=yes
         ;;
 
-      linux* | k*bsd*-gnu | kopensolaris*-gnu)
+      linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
         case $cc_basename in
           KCC*)
 	    # Kuck and Associates, Inc. (KAI) C++ Compiler
diff -Nru evolution-data-server-3.4.3/Makefile.in evolution-data-server-3.4.4/Makefile.in
--- evolution-data-server-3.4.3/Makefile.in	2012-06-18 00:11:21.000000000 +0200
+++ evolution-data-server-3.4.4/Makefile.in	2012-08-12 23:32:47.000000000 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.5 from Makefile.am.
+# Makefile.in generated by automake 1.11.6 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -913,7 +913,7 @@
 	*.zip*) \
 	  unzip $(distdir).zip ;;\
 	esac
-	chmod -R a-w $(distdir); chmod a+w $(distdir)
+	chmod -R a-w $(distdir); chmod u+w $(distdir)
 	mkdir $(distdir)/_build
 	mkdir $(distdir)/_inst
 	chmod a-w $(distdir)
diff -Nru evolution-data-server-3.4.3/NEWS evolution-data-server-3.4.4/NEWS
--- evolution-data-server-3.4.3/NEWS	2012-06-18 00:50:34.000000000 +0200
+++ evolution-data-server-3.4.4/NEWS	2012-08-13 01:33:13.000000000 +0200
@@ -1,3 +1,22 @@
+Evolution-Data-Server 3.4.4 2012-08-13
+--------------------------------------
+
+Bug Fixes:
+	Bug 551788 - Hangs when network changes (Milan Crha)
+	Bug 559391 - Wrong number of unread mails in folder tree (Milan Crha)
+	Bug 674696 - Crash from finish_operation, get_groups_cb in Google
+	             backend (Milan Crha)
+	Bug 677530 - Memory leaks in imapx code (Milan Crha)
+	Bug 678856 - Crash in add_instance() at e-cal-client.c (Milan Crha)
+	Bug 679017 - Broken spool mbox file accounts (Milan Crha)
+	Bug 679245 - Local address book not created (Milan Crha)
+	Bug 679488 - Unable to send mail using SMTP (Milan Crha)
+	Bug 680211 - Memory usage increases on each folder select (Milan Crha)
+	Bug 680502 - Deadlock in contacts backend (Milan Crha)
+	Bug 681318 - Filter by Source account doesn't match in local folders
+	             (Milan Crha)
+
+
 Evolution-Data-Server 3.4.3 2012-06-18
 --------------------------------------
 
diff -Nru evolution-data-server-3.4.3/services/evolution-addressbook-factory/Makefile.in evolution-data-server-3.4.4/services/evolution-addressbook-factory/Makefile.in
--- evolution-data-server-3.4.3/services/evolution-addressbook-factory/Makefile.in	2012-06-18 00:11:16.000000000 +0200
+++ evolution-data-server-3.4.4/services/evolution-addressbook-factory/Makefile.in	2012-08-12 23:32:41.000000000 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.5 from Makefile.am.
+# Makefile.in generated by automake 1.11.6 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
diff -Nru evolution-data-server-3.4.3/services/evolution-calendar-factory/Makefile.in evolution-data-server-3.4.4/services/evolution-calendar-factory/Makefile.in
--- evolution-data-server-3.4.3/services/evolution-calendar-factory/Makefile.in	2012-06-18 00:11:16.000000000 +0200
+++ evolution-data-server-3.4.4/services/evolution-calendar-factory/Makefile.in	2012-08-12 23:32:41.000000000 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.5 from Makefile.am.
+# Makefile.in generated by automake 1.11.6 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
diff -Nru evolution-data-server-3.4.3/services/Makefile.in evolution-data-server-3.4.4/services/Makefile.in
--- evolution-data-server-3.4.3/services/Makefile.in	2012-06-18 00:11:15.000000000 +0200
+++ evolution-data-server-3.4.4/services/Makefile.in	2012-08-12 23:32:40.000000000 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.5 from Makefile.am.
+# Makefile.in generated by automake 1.11.6 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
diff -Nru evolution-data-server-3.4.3/tests/libebook/client/Makefile.in evolution-data-server-3.4.4/tests/libebook/client/Makefile.in
--- evolution-data-server-3.4.3/tests/libebook/client/Makefile.in	2012-06-18 00:11:18.000000000 +0200
+++ evolution-data-server-3.4.4/tests/libebook/client/Makefile.in	2012-08-12 23:32:43.000000000 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.5 from Makefile.am.
+# Makefile.in generated by automake 1.11.6 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
diff -Nru evolution-data-server-3.4.3/tests/libebook/Makefile.in evolution-data-server-3.4.4/tests/libebook/Makefile.in
--- evolution-data-server-3.4.3/tests/libebook/Makefile.in	2012-06-18 00:11:17.000000000 +0200
+++ evolution-data-server-3.4.4/tests/libebook/Makefile.in	2012-08-12 23:32:42.000000000 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.5 from Makefile.am.
+# Makefile.in generated by automake 1.11.6 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
diff -Nru evolution-data-server-3.4.3/tests/libebook/vcard/Makefile.in evolution-data-server-3.4.4/tests/libebook/vcard/Makefile.in
--- evolution-data-server-3.4.3/tests/libebook/vcard/Makefile.in	2012-06-18 00:11:18.000000000 +0200
+++ evolution-data-server-3.4.4/tests/libebook/vcard/Makefile.in	2012-08-12 23:32:43.000000000 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.5 from Makefile.am.
+# Makefile.in generated by automake 1.11.6 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
diff -Nru evolution-data-server-3.4.3/tests/libecal/client/Makefile.in evolution-data-server-3.4.4/tests/libecal/client/Makefile.in
--- evolution-data-server-3.4.3/tests/libecal/client/Makefile.in	2012-06-18 00:11:19.000000000 +0200
+++ evolution-data-server-3.4.4/tests/libecal/client/Makefile.in	2012-08-12 23:32:45.000000000 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.5 from Makefile.am.
+# Makefile.in generated by automake 1.11.6 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
diff -Nru evolution-data-server-3.4.3/tests/libecal/Makefile.in evolution-data-server-3.4.4/tests/libecal/Makefile.in
--- evolution-data-server-3.4.3/tests/libecal/Makefile.in	2012-06-18 00:11:19.000000000 +0200
+++ evolution-data-server-3.4.4/tests/libecal/Makefile.in	2012-08-12 23:32:45.000000000 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.5 from Makefile.am.
+# Makefile.in generated by automake 1.11.6 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
diff -Nru evolution-data-server-3.4.3/tests/libedata-cal/Makefile.in evolution-data-server-3.4.4/tests/libedata-cal/Makefile.in
--- evolution-data-server-3.4.3/tests/libedata-cal/Makefile.in	2012-06-18 00:11:20.000000000 +0200
+++ evolution-data-server-3.4.4/tests/libedata-cal/Makefile.in	2012-08-12 23:32:46.000000000 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.5 from Makefile.am.
+# Makefile.in generated by automake 1.11.6 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
diff -Nru evolution-data-server-3.4.3/tests/libedataserver/Makefile.in evolution-data-server-3.4.4/tests/libedataserver/Makefile.in
--- evolution-data-server-3.4.3/tests/libedataserver/Makefile.in	2012-06-18 00:11:20.000000000 +0200
+++ evolution-data-server-3.4.4/tests/libedataserver/Makefile.in	2012-08-12 23:32:46.000000000 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.5 from Makefile.am.
+# Makefile.in generated by automake 1.11.6 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
diff -Nru evolution-data-server-3.4.3/tests/libedataserverui/Makefile.in evolution-data-server-3.4.4/tests/libedataserverui/Makefile.in
--- evolution-data-server-3.4.3/tests/libedataserverui/Makefile.in	2012-06-18 00:11:20.000000000 +0200
+++ evolution-data-server-3.4.4/tests/libedataserverui/Makefile.in	2012-08-12 23:32:47.000000000 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.5 from Makefile.am.
+# Makefile.in generated by automake 1.11.6 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
diff -Nru evolution-data-server-3.4.3/tests/Makefile.in evolution-data-server-3.4.4/tests/Makefile.in
--- evolution-data-server-3.4.3/tests/Makefile.in	2012-06-18 00:11:17.000000000 +0200
+++ evolution-data-server-3.4.4/tests/Makefile.in	2012-08-12 23:32:41.000000000 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.5 from Makefile.am.
+# Makefile.in generated by automake 1.11.6 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
diff -Nru evolution-data-server-3.4.3/vala/Makefile.in evolution-data-server-3.4.4/vala/Makefile.in
--- evolution-data-server-3.4.3/vala/Makefile.in	2012-06-18 00:11:20.000000000 +0200
+++ evolution-data-server-3.4.4/vala/Makefile.in	2012-08-12 23:32:47.000000000 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.5 from Makefile.am.
+# Makefile.in generated by automake 1.11.6 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,