Hello community,
here is the log from the commit of package evolution-data-server for
openSUSE:Factory checked in at 2015-12-18 21:50:47
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/evolution-data-server (Old)
and /work/SRC/openSUSE:Factory/.evolution-data-server.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "evolution-data-server"
Changes:
--------
---
/work/SRC/openSUSE:Factory/evolution-data-server/evolution-data-server.changes
2015-11-12 19:38:18.000000000 +0100
+++
/work/SRC/openSUSE:Factory/.evolution-data-server.new/evolution-data-server.changes
2015-12-18 21:50:49.000000000 +0100
@@ -1,0 +2,12 @@
+Tue Dec 15 13:25:47 UTC 2015 - [email protected]
+
+- Update to version 3.18.3:
+ + [Camel] Check for session existence in store/folder
+ maybe_connect.
+ + [IMAPx] Doesn't ask for password when a wrong is entered.
+ + [POP3] Avoid deadlock around pop3_folder_get_message_sync().
+ + [ECacheReaper] Recover data for private folders.
+ + Correct test-vcard-parsing, use unique test names.
+ + Bugs fixed: bgo#757789, bgo#702127, bgo#746675.
+
+-------------------------------------------------------------------
Old:
----
evolution-data-server-3.18.2.tar.xz
New:
----
evolution-data-server-3.18.3.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ evolution-data-server.spec ++++++
--- /var/tmp/diff_new_pack.KIEmXF/_old 2015-12-18 21:50:50.000000000 +0100
+++ /var/tmp/diff_new_pack.KIEmXF/_new 2015-12-18 21:50:50.000000000 +0100
@@ -33,7 +33,7 @@
Name: evolution-data-server
%define _evo_version 3.18
-Version: 3.18.2
+Version: 3.18.3
Release: 0
Summary: Evolution Data Server
License: LGPL-2.1+
++++++ evolution-data-server-3.18.2.tar.xz ->
evolution-data-server-3.18.3.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/evolution-data-server-3.18.2/NEWS
new/evolution-data-server-3.18.3/NEWS
--- old/evolution-data-server-3.18.2/NEWS 2015-11-09 08:18:14.000000000
+0100
+++ new/evolution-data-server-3.18.3/NEWS 2015-12-14 11:24:59.000000000
+0100
@@ -1,3 +1,18 @@
+Evolution-Data-Server 3.18.3 2015-12-14
+---------------------------------------
+
+Bug Fixes:
+ Bug 757789 - [IMAPx] Incorrect unref of a message info on message copy
(Milan Crha)
+ Bug 702127 - Crash under cal_backend_store_save_cache_now() (Milan Crha)
+ Bug 746675 - Workaround thread unsafety of
icaltimezone_load_builtin_timezone() (Milan Crha)
+
+Miscellaneous:
+ [Camel] Check for session existence in store/folder maybe_connect
(Milan Crha)
+ [IMAPx] Doesn't ask for password when a wrong is entered (Milan Crha)
+ [POP3] Avoid deadlock around pop3_folder_get_message_sync() (Milan Crha)
+ [ECacheReaper] Recover data for private folders (Milan Crha)
+ Correct test-vcard-parsing, use unique test names (Milan Crha)
+
Evolution-Data-Server 3.18.2 2015-11-09
---------------------------------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/evolution-data-server-3.18.2/calendar/libedata-cal/e-cal-backend-store.c
new/evolution-data-server-3.18.3/calendar/libedata-cal/e-cal-backend-store.c
---
old/evolution-data-server-3.18.2/calendar/libedata-cal/e-cal-backend-store.c
2015-03-23 07:41:04.000000000 +0100
+++
new/evolution-data-server-3.18.3/calendar/libedata-cal/e-cal-backend-store.c
2015-11-19 08:21:50.000000000 +0100
@@ -363,21 +363,60 @@
if (g_rename (tmpfile, store->priv->cache_file_name) != 0)
g_unlink (tmpfile);
+ store->priv->dirty = FALSE;
+
error:
g_rw_lock_reader_unlock (&store->priv->lock);
g_free (tmpfile);
g_free (data);
}
+static void
+cal_backend_store_toggle_ref_cb (gpointer data,
+ GObject *object,
+ gboolean is_last_ref)
+{
+ ECalBackendStore *store;
+
+ g_return_if_fail (E_IS_CAL_BACKEND_STORE (object));
+
+ if (!is_last_ref)
+ return;
+
+ store = E_CAL_BACKEND_STORE (object);
+
+ g_mutex_lock (&store->priv->save_timeout_lock);
+ g_object_ref (store);
+ g_object_remove_toggle_ref (G_OBJECT (store),
cal_backend_store_toggle_ref_cb, NULL);
+ store->priv->dirty = TRUE;
+ store->priv->save_timeout_id = 0;
+ g_mutex_unlock (&store->priv->save_timeout_lock);
+
+ g_object_unref (store);
+}
+
static gboolean
cal_backend_store_save_cache_timeout_cb (gpointer user_data)
{
ECalBackendStore *store;
+ GSource *source;
GList *timezones_to_save;
+ source = g_main_current_source ();
+ if (g_source_is_destroyed (source))
+ return FALSE;
+
store = E_CAL_BACKEND_STORE (user_data);
g_mutex_lock (&store->priv->save_timeout_lock);
+ if (store->priv->save_timeout_id != g_source_get_id (source)) {
+ g_mutex_unlock (&store->priv->save_timeout_lock);
+ return FALSE;
+ }
+
+ g_object_ref (store);
+
+ g_object_remove_toggle_ref (G_OBJECT (store),
cal_backend_store_toggle_ref_cb, NULL);
store->priv->save_timeout_id = 0;
timezones_to_save = store->priv->timezones_to_save;
store->priv->timezones_to_save = NULL;
@@ -389,6 +428,8 @@
timezones_to_save,
(GDestroyNotify) cal_backend_store_free_zone);
+ g_object_unref (store);
+
return FALSE;
}
@@ -420,8 +461,12 @@
g_mutex_lock (&store->priv->save_timeout_lock);
- if (store->priv->save_timeout_id > 0)
+ if (store->priv->save_timeout_id > 0) {
g_source_remove (store->priv->save_timeout_id);
+ g_object_remove_toggle_ref (G_OBJECT (store),
cal_backend_store_toggle_ref_cb, NULL);
+ }
+
+ g_object_add_toggle_ref (G_OBJECT (store),
cal_backend_store_toggle_ref_cb, NULL);
store->priv->save_timeout_id = e_named_timeout_add_seconds (
IDLE_SAVE_TIMEOUT_SECONDS,
@@ -526,9 +571,13 @@
/* If a save is scheduled, cancel it and save now. */
g_mutex_lock (&priv->save_timeout_lock);
- if (priv->save_timeout_id > 0) {
- g_source_remove (priv->save_timeout_id);
- priv->save_timeout_id = 0;
+ if (priv->save_timeout_id > 0 || priv->dirty) {
+ if (priv->save_timeout_id > 0) {
+ g_object_remove_toggle_ref (object,
cal_backend_store_toggle_ref_cb, NULL);
+ g_source_remove (priv->save_timeout_id);
+ priv->save_timeout_id = 0;
+ }
+
timezones_to_save = priv->timezones_to_save;
priv->timezones_to_save = NULL;
save_needed = TRUE;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/evolution-data-server-3.18.2/calendar/libedata-cal/e-subprocess-cal-factory.c
new/evolution-data-server-3.18.3/calendar/libedata-cal/e-subprocess-cal-factory.c
---
old/evolution-data-server-3.18.2/calendar/libedata-cal/e-subprocess-cal-factory.c
2015-09-21 11:19:59.000000000 +0200
+++
new/evolution-data-server-3.18.3/calendar/libedata-cal/e-subprocess-cal-factory.c
2015-11-25 09:04:04.000000000 +0100
@@ -137,6 +137,36 @@
e_subprocess_cal_factory_new (GCancellable *cancellable,
GError **error)
{
+ icalarray *builtin_timezones;
+ gint ii;
+
+#ifdef HAVE_ICAL_UNKNOWN_TOKEN_HANDLING
+ ical_set_unknown_token_handling_setting (ICAL_DISCARD_TOKEN);
+#endif
+
+ /* XXX Pre-load all built-in timezones in libical.
+ *
+ * Built-in time zones in libical 0.43 are loaded on demand,
+ * but not in a thread-safe manner, resulting in a race when
+ * multiple threads call icaltimezone_load_builtin_timezone()
+ * on the same time zone. Until built-in time zone loading
+ * in libical is made thread-safe, work around the issue by
+ * loading all built-in time zones now, so libical's internal
+ * time zone array will be fully populated before any threads
+ * are spawned.
+ */
+ builtin_timezones = icaltimezone_get_builtin_timezones ();
+ for (ii = 0; ii < builtin_timezones->num_elements; ii++) {
+ icaltimezone *zone;
+
+ zone = icalarray_element_at (builtin_timezones, ii);
+
+ /* We don't care about the component right now,
+ * we just need some function that will trigger
+ * icaltimezone_load_builtin_timezone(). */
+ icaltimezone_get_component (zone);
+ }
+
return g_initable_new (
E_TYPE_SUBPROCESS_CAL_FACTORY,
cancellable, error, NULL);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/evolution-data-server-3.18.2/camel/camel-folder.c
new/evolution-data-server-3.18.3/camel/camel-folder.c
--- old/evolution-data-server-3.18.2/camel/camel-folder.c 2015-09-21
11:19:59.000000000 +0200
+++ new/evolution-data-server-3.18.3/camel/camel-folder.c 2015-11-13
16:14:54.000000000 +0100
@@ -528,7 +528,7 @@
service = CAMEL_SERVICE (parent_store);
session = camel_service_ref_session (service);
status = camel_service_get_connection_status (service);
- connect = camel_session_get_online (session) && (status !=
CAMEL_SERVICE_CONNECTED);
+ connect = session && camel_session_get_online (session) && (status !=
CAMEL_SERVICE_CONNECTED);
g_clear_object (&session);
if (connect && CAMEL_IS_NETWORK_SERVICE (parent_store)) {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/evolution-data-server-3.18.2/camel/camel-store.c
new/evolution-data-server-3.18.3/camel/camel-store.c
--- old/evolution-data-server-3.18.2/camel/camel-store.c 2015-09-21
11:19:59.000000000 +0200
+++ new/evolution-data-server-3.18.3/camel/camel-store.c 2015-11-13
16:14:54.000000000 +0100
@@ -305,7 +305,7 @@
service = CAMEL_SERVICE (store);
session = camel_service_ref_session (service);
status = camel_service_get_connection_status (service);
- connect = camel_session_get_online (session) && (status !=
CAMEL_SERVICE_CONNECTED);
+ connect = session && camel_session_get_online (session) && (status !=
CAMEL_SERVICE_CONNECTED);
g_clear_object (&session);
if (connect && CAMEL_IS_NETWORK_SERVICE (store)) {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/evolution-data-server-3.18.2/camel/providers/imapx/camel-imapx-server.c
new/evolution-data-server-3.18.3/camel/providers/imapx/camel-imapx-server.c
--- old/evolution-data-server-3.18.2/camel/providers/imapx/camel-imapx-server.c
2015-10-08 09:09:42.000000000 +0200
+++ new/evolution-data-server-3.18.3/camel/providers/imapx/camel-imapx-server.c
2015-11-19 10:47:47.000000000 +0100
@@ -2935,11 +2935,14 @@
ic = camel_imapx_command_new (is, CAMEL_IMAPX_JOB_LOGIN, "LOGIN
%s %s", user, password);
}
- if (!camel_imapx_server_process_command_sync (is, ic, _("Failed to
authenticate"), cancellable, error))
+ if (!camel_imapx_server_process_command_sync (is, ic, _("Failed to
authenticate"), cancellable, error) && (
+ !ic->status || ic->status->result != IMAPX_NO))
result = CAMEL_AUTHENTICATION_ERROR;
else if (ic->status->result == IMAPX_OK)
result = CAMEL_AUTHENTICATION_ACCEPTED;
else if (ic->status->result == IMAPX_NO) {
+ g_clear_error (error);
+
if (camel_imapx_store_is_connecting_concurrent_connection
(store)) {
/* At least one connection succeeded, probably max
connection limit
set on the server had been reached, thus use special
error code
@@ -4199,9 +4202,14 @@
cancellable, error);
if (success) {
- if (is->priv->copyuid_status &&
is->priv->copyuid_status->u.copyuid.uids &&
- is->priv->copyuid_status->u.copyuid.copied_uids &&
- is->priv->copyuid_status->u.copyuid.uids->len ==
is->priv->copyuid_status->u.copyuid.copied_uids->len) {
+ struct _status_info *copyuid_status =
is->priv->copyuid_status;
+
+ if (ic->status && ic->status->condition ==
IMAPX_COPYUID)
+ copyuid_status = ic->status;
+
+ if (copyuid_status && copyuid_status->u.copyuid.uids &&
+ copyuid_status->u.copyuid.copied_uids &&
+ copyuid_status->u.copyuid.uids->len ==
copyuid_status->u.copyuid.copied_uids->len) {
CamelFolder *destination_folder;
destination_folder = imapx_server_ref_folder
(is, destination);
@@ -4212,18 +4220,18 @@
changes = camel_folder_change_info_new
();
- for (ii = 0; ii <
is->priv->copyuid_status->u.copyuid.uids->len; ii++) {
+ for (ii = 0; ii <
copyuid_status->u.copyuid.uids->len; ii++) {
gchar *uid;
gboolean is_new = FALSE;
- uid = g_strdup_printf ("%d",
g_array_index (is->priv->copyuid_status->u.copyuid.uids, guint32, ii));
+ uid = g_strdup_printf ("%d",
g_array_index (copyuid_status->u.copyuid.uids, guint32, ii));
source_info =
g_hash_table_lookup (source_infos, uid);
g_free (uid);
if (!source_info)
continue;
- uid = g_strdup_printf ("%d",
g_array_index (is->priv->copyuid_status->u.copyuid.copied_uids, guint32, ii));
+ uid = g_strdup_printf ("%d",
g_array_index (copyuid_status->u.copyuid.copied_uids, guint32, ii));
destination_info =
camel_folder_summary_get (folder->summary, uid);
if (!destination_info) {
@@ -4251,7 +4259,6 @@
camel_folder_summary_add (destination_folder->summary, destination_info);
camel_folder_change_info_add_uid (changes, destination_info->uid);
- camel_message_info_unref
(source_info);
if (!is_new)
camel_message_info_unref (destination_info);
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/evolution-data-server-3.18.2/camel/providers/pop3/camel-pop3-folder.c
new/evolution-data-server-3.18.3/camel/providers/pop3/camel-pop3-folder.c
--- old/evolution-data-server-3.18.2/camel/providers/pop3/camel-pop3-folder.c
2015-09-21 11:19:59.000000000 +0200
+++ new/evolution-data-server-3.18.3/camel/providers/pop3/camel-pop3-folder.c
2015-11-26 15:18:55.000000000 +0100
@@ -395,10 +395,11 @@
}
static CamelMimeMessage *
-pop3_folder_get_message_sync (CamelFolder *folder,
- const gchar *uid,
- GCancellable *cancellable,
- GError **error)
+pop3_folder_get_message_internal_sync (CamelFolder *folder,
+ const gchar *uid,
+ gboolean already_locked,
+ GCancellable *cancellable,
+ GError **error)
{
CamelStore *parent_store;
CamelMimeMessage *message = NULL;
@@ -457,7 +458,7 @@
pop3_engine = camel_pop3_store_ref_engine (pop3_store);
- if (!camel_pop3_engine_busy_lock (pop3_engine, cancellable, error))
+ if (!already_locked && !camel_pop3_engine_busy_lock (pop3_engine,
cancellable, error))
goto fail;
/* If we have an oustanding retrieve message running, wait for that to
complete
@@ -475,7 +476,8 @@
if (i == -1) {
g_prefix_error (
error, _("Cannot get message %s: "), uid);
- camel_pop3_engine_busy_unlock (pop3_engine);
+ if (!already_locked)
+ camel_pop3_engine_busy_unlock (pop3_engine);
goto fail;
}
}
@@ -586,7 +588,8 @@
camel_medium_add_header (CAMEL_MEDIUM (message),
"X-Evolution-POP3-UID", uid);
}
done:
- camel_pop3_engine_busy_unlock (pop3_engine);
+ if (!already_locked)
+ camel_pop3_engine_busy_unlock (pop3_engine);
g_clear_object (&stream);
fail:
g_clear_object (&pop3_engine);
@@ -596,6 +599,15 @@
return message;
}
+static CamelMimeMessage *
+pop3_folder_get_message_sync (CamelFolder *folder,
+ const gchar *uid,
+ GCancellable *cancellable,
+ GError **error)
+{
+ return pop3_folder_get_message_internal_sync (folder, uid, FALSE,
cancellable, error);
+}
+
static gboolean
pop3_folder_refresh_info_sync (CamelFolder *folder,
GCancellable *cancellable,
@@ -1079,8 +1091,8 @@
d (printf ("%s(%d): fi->uid=[%s]\n", __FILE__, __LINE__,
fi->uid));
if (!pop3_get_message_time_from_cache (folder, fi->uid,
&message_time)) {
d (printf ("could not get message time from cache,
trying from pop3\n"));
- message = pop3_folder_get_message_sync (
- folder, fi->uid, cancellable, error);
+ message = pop3_folder_get_message_internal_sync (
+ folder, fi->uid, TRUE, cancellable, error);
if (message) {
message_time = message->date +
message->date_offset;
g_object_unref (message);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/evolution-data-server-3.18.2/configure
new/evolution-data-server-3.18.3/configure
--- old/evolution-data-server-3.18.2/configure 2015-11-09 08:27:02.000000000
+0100
+++ new/evolution-data-server-3.18.3/configure 2015-12-14 11:25:29.000000000
+0100
@@ -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.18.2.
+# Generated by GNU Autoconf 2.69 for evolution-data-server 3.18.3.
#
# Report bugs to
<http://bugzilla.gnome.org/enter_bug.cgi?product=Evolution-Data-Server>.
#
@@ -651,8 +651,8 @@
# Identity of this package.
PACKAGE_NAME='evolution-data-server'
PACKAGE_TARNAME='evolution-data-server'
-PACKAGE_VERSION='3.18.2'
-PACKAGE_STRING='evolution-data-server 3.18.2'
+PACKAGE_VERSION='3.18.3'
+PACKAGE_STRING='evolution-data-server 3.18.3'
PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=Evolution-Data-Server'
PACKAGE_URL=''
@@ -1768,7 +1768,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.18.2 to adapt to many kinds of
systems.
+\`configure' configures evolution-data-server 3.18.3 to adapt to many kinds of
systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1839,7 +1839,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of evolution-data-server
3.18.2:";;
+ short | recursive ) echo "Configuration of evolution-data-server
3.18.3:";;
esac
cat <<\_ACEOF
@@ -2104,7 +2104,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-evolution-data-server configure 3.18.2
+evolution-data-server configure 3.18.3
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2690,7 +2690,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.18.2, which was
+It was created by evolution-data-server $as_me 3.18.3, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -3553,7 +3553,7 @@
# Define the identity of the package.
PACKAGE='evolution-data-server'
- VERSION='3.18.2'
+ VERSION='3.18.3'
cat >>confdefs.h <<_ACEOF
@@ -3852,7 +3852,7 @@
EDS_MAJOR_VERSION=3
EDS_MINOR_VERSION=18
-EDS_MICRO_VERSION=2
+EDS_MICRO_VERSION=3
@@ -27606,7 +27606,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.18.2, which was
+This file was extended by evolution-data-server $as_me 3.18.3, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -27672,7 +27672,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.18.2
+evolution-data-server config.status 3.18.3
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/evolution-data-server-3.18.2/configure.ac
new/evolution-data-server-3.18.3/configure.ac
--- old/evolution-data-server-3.18.2/configure.ac 2015-10-12
08:35:42.000000000 +0200
+++ new/evolution-data-server-3.18.3/configure.ac 2015-11-09
08:32:16.000000000 +0100
@@ -2,7 +2,7 @@
dnl Evolution-Data-Server version
m4_define([eds_major_version], [3])
m4_define([eds_minor_version], [18])
-m4_define([eds_micro_version], [2])
+m4_define([eds_micro_version], [3])
m4_define([eds_version],
[eds_major_version.eds_minor_version.eds_micro_version])
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/evolution-data-server-3.18.2/docs/reference/eds/html/eds-Version-Checking.html
new/evolution-data-server-3.18.3/docs/reference/eds/html/eds-Version-Checking.html
---
old/evolution-data-server-3.18.2/docs/reference/eds/html/eds-Version-Checking.html
2015-11-09 08:30:05.000000000 +0100
+++
new/evolution-data-server-3.18.3/docs/reference/eds/html/eds-Version-Checking.html
2015-12-14 11:31:48.000000000 +0100
@@ -203,7 +203,7 @@
<hr>
<div class="refsect2">
<a name="EDS-MICRO-VERSION:CAPS"></a><h3>EDS_MICRO_VERSION</h3>
-<pre class="programlisting">#define EDS_MICRO_VERSION 2
+<pre class="programlisting">#define EDS_MICRO_VERSION 3
</pre>
<p>The micro version number of the Evolution-Data-Server library. Like
<a class="link" href="eds-Version-Checking.html#eds-micro-version"
title="eds_micro_version"><code
class="function">eds_micro_version()</code></a>, but from the headers used at
application compile
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/evolution-data-server-3.18.2/docs/reference/eds/html/index.html
new/evolution-data-server-3.18.3/docs/reference/eds/html/index.html
--- old/evolution-data-server-3.18.2/docs/reference/eds/html/index.html
2015-11-09 08:30:05.000000000 +0100
+++ new/evolution-data-server-3.18.3/docs/reference/eds/html/index.html
2015-12-14 11:31:48.000000000 +0100
@@ -15,7 +15,7 @@
<div class="titlepage">
<div>
<div><table class="navigation" id="top" width="100%" cellpadding="2"
cellspacing="0"><tr><th valign="middle"><p class="title">Evolution-Data-Server
Reference Manual</p></th></tr></table></div>
-<div><p class="releaseinfo">Reference Manual for evolution-data-server 3.18.2
+<div><p class="releaseinfo">Reference Manual for evolution-data-server 3.18.3
</p></div>
<div><div class="abstract">
<p class="title"><b>Abstract</b></p>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/evolution-data-server-3.18.2/docs/reference/eds/version.xml
new/evolution-data-server-3.18.3/docs/reference/eds/version.xml
--- old/evolution-data-server-3.18.2/docs/reference/eds/version.xml
2015-11-09 08:27:14.000000000 +0100
+++ new/evolution-data-server-3.18.3/docs/reference/eds/version.xml
2015-12-14 11:25:44.000000000 +0100
@@ -1 +1 @@
-evolution-data-server 3.18.2
+evolution-data-server 3.18.3
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/evolution-data-server-3.18.2/libebackend/e-cache-reaper.c
new/evolution-data-server-3.18.3/libebackend/e-cache-reaper.c
--- old/evolution-data-server-3.18.2/libebackend/e-cache-reaper.c
2015-09-21 11:19:59.000000000 +0200
+++ new/evolution-data-server-3.18.3/libebackend/e-cache-reaper.c
2015-11-27 15:22:07.000000000 +0100
@@ -387,18 +387,15 @@
static void
cache_reaper_recover_from_trash (ECacheReaper *extension,
- ESource *source,
+ const gchar *directory_uid,
GFile *base_directory,
GFile *trash_directory)
{
GFile *source_directory;
GFile *target_directory;
- const gchar *uid;
- uid = e_source_get_uid (source);
-
- source_directory = g_file_get_child (trash_directory, uid);
- target_directory = g_file_get_child (base_directory, uid);
+ source_directory = g_file_get_child (trash_directory, directory_uid);
+ target_directory = g_file_get_child (base_directory, directory_uid);
/* This is a no-op if the source directory does not exist. */
cache_reaper_move_directory (source_directory, target_directory);
@@ -408,9 +405,34 @@
}
static void
+cache_reaper_recover_for_uid (ECacheReaper *extension,
+ const gchar *uid)
+{
+ guint ii;
+
+ /* The Cache Reaper is not too proud to dig through the
+ * trash on the off chance the newly-added source has a
+ * recoverable data or cache directory. */
+
+ for (ii = 0; ii < extension->n_data_directories; ii++)
+ cache_reaper_recover_from_trash (
+ extension, uid,
+ extension->data_directories[ii],
+ extension->data_trash_directories[ii]);
+
+ for (ii = 0; ii < extension->n_cache_directories; ii++)
+ cache_reaper_recover_from_trash (
+ extension, uid,
+ extension->cache_directories[ii],
+ extension->cache_trash_directories[ii]);
+}
+
+static void
cache_reaper_files_loaded_cb (ESourceRegistryServer *server,
ECacheReaper *extension)
{
+ GSList *link;
+
cache_reaper_scan_data_directories (extension);
cache_reaper_scan_cache_directories (extension);
@@ -422,6 +444,13 @@
cache_reaper_reap_trash_directories,
extension);
}
+
+ for (link = extension->private_directories; link; link = g_slist_next
(link)) {
+ const gchar *directory = link->data;
+
+ if (directory && *directory)
+ cache_reaper_recover_for_uid (extension, directory);
+ }
}
static void
@@ -429,23 +458,7 @@
ESource *source,
ECacheReaper *extension)
{
- guint ii;
-
- /* The Cache Reaper is not too proud to dig through the
- * trash on the off chance the newly-added source has a
- * recoverable data or cache directory. */
-
- for (ii = 0; ii < extension->n_data_directories; ii++)
- cache_reaper_recover_from_trash (
- extension, source,
- extension->data_directories[ii],
- extension->data_trash_directories[ii]);
-
- for (ii = 0; ii < extension->n_cache_directories; ii++)
- cache_reaper_recover_from_trash (
- extension, source,
- extension->cache_directories[ii],
- extension->cache_trash_directories[ii]);
+ cache_reaper_recover_for_uid (extension, e_source_get_uid (source));
}
static void
@@ -681,6 +694,8 @@
return;
cache_reaper->private_directories = g_slist_prepend
(cache_reaper->private_directories, g_strdup (name));
+
+ cache_reaper_recover_for_uid (cache_reaper, name);
}
/**
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/evolution-data-server-3.18.2/libedataserver/eds-version.h
new/evolution-data-server-3.18.3/libedataserver/eds-version.h
--- old/evolution-data-server-3.18.2/libedataserver/eds-version.h
2015-11-09 08:27:13.000000000 +0100
+++ new/evolution-data-server-3.18.3/libedataserver/eds-version.h
2015-12-14 11:25:43.000000000 +0100
@@ -49,7 +49,7 @@
* time, rather than from the library linked against at application run
* time.
**/
-#define EDS_MICRO_VERSION 2
+#define EDS_MICRO_VERSION 3
/**
* EDS_CHECK_VERSION:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/evolution-data-server-3.18.2/modules/ubuntu-online-accounts/evolution-data-server-uoa.desktop
new/evolution-data-server-3.18.3/modules/ubuntu-online-accounts/evolution-data-server-uoa.desktop
---
old/evolution-data-server-3.18.2/modules/ubuntu-online-accounts/evolution-data-server-uoa.desktop
2015-11-09 08:30:04.000000000 +0100
+++
new/evolution-data-server-3.18.3/modules/ubuntu-online-accounts/evolution-data-server-uoa.desktop
2015-12-14 11:31:46.000000000 +0100
@@ -90,4 +90,4 @@
X-GNOME-Bugzilla-Bugzilla=GNOME
X-GNOME-Bugzilla-Product=evolution-data-server
X-GNOME-Bugzilla-Component=General
-X-GNOME-Bugzilla-Version=3.18.2
+X-GNOME-Bugzilla-Version=3.18.3
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/evolution-data-server-3.18.2/services/evolution-source-registry/evolution-source-registry-resource.c
new/evolution-data-server-3.18.3/services/evolution-source-registry/evolution-source-registry-resource.c
---
old/evolution-data-server-3.18.2/services/evolution-source-registry/evolution-source-registry-resource.c
2015-11-05 15:33:40.000000000 +0100
+++
new/evolution-data-server-3.18.3/services/evolution-source-registry/evolution-source-registry-resource.c
2015-11-09 09:31:41.000000000 +0100
@@ -6,7 +6,7 @@
# define SECTION
#endif
-static const SECTION union { const guint8 data[36232]; const double alignment;
void * const ptr;} evolution_source_registry_resource_data = { {
+static const SECTION union { const guint8 data[37512]; const double alignment;
void * const ptr;} evolution_source_registry_resource_data = { {
0x47, 0x56, 0x61, 0x72, 0x69, 0x61, 0x6e, 0x74,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x18, 0x00, 0x00, 0x00, 0xa4, 0x02, 0x00, 0x00,
@@ -43,55 +43,55 @@
0x4d, 0x2b, 0x00, 0x00, 0xb7, 0x39, 0x08, 0xac,
0x09, 0x00, 0x00, 0x00, 0x4d, 0x2b, 0x00, 0x00,
0x12, 0x00, 0x76, 0x00, 0x60, 0x2b, 0x00, 0x00,
- 0xa7, 0x2b, 0x00, 0x00, 0x4b, 0xed, 0xd0, 0x8f,
- 0x03, 0x00, 0x00, 0x00, 0xa7, 0x2b, 0x00, 0x00,
- 0x13, 0x00, 0x76, 0x00, 0xc0, 0x2b, 0x00, 0x00,
- 0x56, 0x2c, 0x00, 0x00, 0xcf, 0xa8, 0x84, 0x78,
- 0x16, 0x00, 0x00, 0x00, 0x56, 0x2c, 0x00, 0x00,
- 0x16, 0x00, 0x4c, 0x00, 0x6c, 0x2c, 0x00, 0x00,
- 0x74, 0x2c, 0x00, 0x00, 0xd0, 0x24, 0x17, 0x21,
- 0x08, 0x00, 0x00, 0x00, 0x74, 0x2c, 0x00, 0x00,
- 0x0b, 0x00, 0x4c, 0x00, 0x80, 0x2c, 0x00, 0x00,
- 0xa0, 0x2c, 0x00, 0x00, 0x44, 0xd4, 0x6c, 0xcd,
- 0x03, 0x00, 0x00, 0x00, 0xa0, 0x2c, 0x00, 0x00,
- 0x0f, 0x00, 0x76, 0x00, 0xb0, 0x2c, 0x00, 0x00,
- 0x6a, 0x35, 0x00, 0x00, 0xc7, 0x1f, 0x3f, 0x63,
- 0x03, 0x00, 0x00, 0x00, 0x6a, 0x35, 0x00, 0x00,
- 0x1a, 0x00, 0x76, 0x00, 0x88, 0x35, 0x00, 0x00,
- 0x50, 0x3f, 0x00, 0x00, 0xd4, 0xb5, 0x02, 0x00,
- 0xff, 0xff, 0xff, 0xff, 0x50, 0x3f, 0x00, 0x00,
- 0x01, 0x00, 0x4c, 0x00, 0x54, 0x3f, 0x00, 0x00,
- 0x58, 0x3f, 0x00, 0x00, 0xbb, 0x3f, 0xc0, 0x6e,
- 0x09, 0x00, 0x00, 0x00, 0x58, 0x3f, 0x00, 0x00,
- 0x10, 0x00, 0x76, 0x00, 0x68, 0x3f, 0x00, 0x00,
- 0x13, 0x48, 0x00, 0x00, 0x62, 0xd3, 0xba, 0xad,
- 0x03, 0x00, 0x00, 0x00, 0x13, 0x48, 0x00, 0x00,
- 0x0c, 0x00, 0x76, 0x00, 0x20, 0x48, 0x00, 0x00,
- 0x74, 0x55, 0x00, 0x00, 0xb3, 0x79, 0xeb, 0x01,
- 0x09, 0x00, 0x00, 0x00, 0x74, 0x55, 0x00, 0x00,
- 0x12, 0x00, 0x76, 0x00, 0x88, 0x55, 0x00, 0x00,
- 0xb5, 0x5a, 0x00, 0x00, 0x81, 0x84, 0x17, 0x78,
- 0x03, 0x00, 0x00, 0x00, 0xb5, 0x5a, 0x00, 0x00,
- 0x10, 0x00, 0x76, 0x00, 0xc8, 0x5a, 0x00, 0x00,
- 0x34, 0x66, 0x00, 0x00, 0xea, 0x4e, 0x41, 0x5c,
- 0x09, 0x00, 0x00, 0x00, 0x34, 0x66, 0x00, 0x00,
- 0x13, 0x00, 0x76, 0x00, 0x48, 0x66, 0x00, 0x00,
- 0x29, 0x6c, 0x00, 0x00, 0x43, 0x09, 0xf4, 0x52,
- 0x03, 0x00, 0x00, 0x00, 0x29, 0x6c, 0x00, 0x00,
- 0x16, 0x00, 0x76, 0x00, 0x40, 0x6c, 0x00, 0x00,
- 0xfe, 0x75, 0x00, 0x00, 0x85, 0x3a, 0x5c, 0x31,
- 0x03, 0x00, 0x00, 0x00, 0xfe, 0x75, 0x00, 0x00,
- 0x17, 0x00, 0x76, 0x00, 0x18, 0x76, 0x00, 0x00,
- 0xd7, 0x7f, 0x00, 0x00, 0x05, 0x10, 0x60, 0x23,
- 0x09, 0x00, 0x00, 0x00, 0xd7, 0x7f, 0x00, 0x00,
- 0x11, 0x00, 0x76, 0x00, 0xe8, 0x7f, 0x00, 0x00,
- 0x71, 0x8d, 0x00, 0x00, 0x4b, 0x50, 0x90, 0x0b,
- 0x0c, 0x00, 0x00, 0x00, 0x71, 0x8d, 0x00, 0x00,
- 0x04, 0x00, 0x4c, 0x00, 0x78, 0x8d, 0x00, 0x00,
- 0x7c, 0x8d, 0x00, 0x00, 0xb0, 0xb7, 0x24, 0x30,
- 0x15, 0x00, 0x00, 0x00, 0x7c, 0x8d, 0x00, 0x00,
- 0x06, 0x00, 0x4c, 0x00, 0x84, 0x8d, 0x00, 0x00,
- 0x88, 0x8d, 0x00, 0x00, 0x76, 0x66, 0x6f, 0x6c,
+ 0xad, 0x30, 0x00, 0x00, 0x4b, 0xed, 0xd0, 0x8f,
+ 0x03, 0x00, 0x00, 0x00, 0xad, 0x30, 0x00, 0x00,
+ 0x13, 0x00, 0x76, 0x00, 0xc0, 0x30, 0x00, 0x00,
+ 0x56, 0x31, 0x00, 0x00, 0xcf, 0xa8, 0x84, 0x78,
+ 0x16, 0x00, 0x00, 0x00, 0x56, 0x31, 0x00, 0x00,
+ 0x16, 0x00, 0x4c, 0x00, 0x6c, 0x31, 0x00, 0x00,
+ 0x74, 0x31, 0x00, 0x00, 0xd0, 0x24, 0x17, 0x21,
+ 0x08, 0x00, 0x00, 0x00, 0x74, 0x31, 0x00, 0x00,
+ 0x0b, 0x00, 0x4c, 0x00, 0x80, 0x31, 0x00, 0x00,
+ 0xa0, 0x31, 0x00, 0x00, 0x44, 0xd4, 0x6c, 0xcd,
+ 0x03, 0x00, 0x00, 0x00, 0xa0, 0x31, 0x00, 0x00,
+ 0x0f, 0x00, 0x76, 0x00, 0xb0, 0x31, 0x00, 0x00,
+ 0x6a, 0x3a, 0x00, 0x00, 0xc7, 0x1f, 0x3f, 0x63,
+ 0x03, 0x00, 0x00, 0x00, 0x6a, 0x3a, 0x00, 0x00,
+ 0x1a, 0x00, 0x76, 0x00, 0x88, 0x3a, 0x00, 0x00,
+ 0x50, 0x44, 0x00, 0x00, 0xd4, 0xb5, 0x02, 0x00,
+ 0xff, 0xff, 0xff, 0xff, 0x50, 0x44, 0x00, 0x00,
+ 0x01, 0x00, 0x4c, 0x00, 0x54, 0x44, 0x00, 0x00,
+ 0x58, 0x44, 0x00, 0x00, 0xbb, 0x3f, 0xc0, 0x6e,
+ 0x09, 0x00, 0x00, 0x00, 0x58, 0x44, 0x00, 0x00,
+ 0x10, 0x00, 0x76, 0x00, 0x68, 0x44, 0x00, 0x00,
+ 0x13, 0x4d, 0x00, 0x00, 0x62, 0xd3, 0xba, 0xad,
+ 0x03, 0x00, 0x00, 0x00, 0x13, 0x4d, 0x00, 0x00,
+ 0x0c, 0x00, 0x76, 0x00, 0x20, 0x4d, 0x00, 0x00,
+ 0x74, 0x5a, 0x00, 0x00, 0xb3, 0x79, 0xeb, 0x01,
+ 0x09, 0x00, 0x00, 0x00, 0x74, 0x5a, 0x00, 0x00,
+ 0x12, 0x00, 0x76, 0x00, 0x88, 0x5a, 0x00, 0x00,
+ 0xb5, 0x5f, 0x00, 0x00, 0x81, 0x84, 0x17, 0x78,
+ 0x03, 0x00, 0x00, 0x00, 0xb5, 0x5f, 0x00, 0x00,
+ 0x10, 0x00, 0x76, 0x00, 0xc8, 0x5f, 0x00, 0x00,
+ 0x34, 0x6b, 0x00, 0x00, 0xea, 0x4e, 0x41, 0x5c,
+ 0x09, 0x00, 0x00, 0x00, 0x34, 0x6b, 0x00, 0x00,
+ 0x13, 0x00, 0x76, 0x00, 0x48, 0x6b, 0x00, 0x00,
+ 0x29, 0x71, 0x00, 0x00, 0x43, 0x09, 0xf4, 0x52,
+ 0x03, 0x00, 0x00, 0x00, 0x29, 0x71, 0x00, 0x00,
+ 0x16, 0x00, 0x76, 0x00, 0x40, 0x71, 0x00, 0x00,
+ 0xfe, 0x7a, 0x00, 0x00, 0x85, 0x3a, 0x5c, 0x31,
+ 0x03, 0x00, 0x00, 0x00, 0xfe, 0x7a, 0x00, 0x00,
+ 0x17, 0x00, 0x76, 0x00, 0x18, 0x7b, 0x00, 0x00,
+ 0xd7, 0x84, 0x00, 0x00, 0x05, 0x10, 0x60, 0x23,
+ 0x09, 0x00, 0x00, 0x00, 0xd7, 0x84, 0x00, 0x00,
+ 0x11, 0x00, 0x76, 0x00, 0xe8, 0x84, 0x00, 0x00,
+ 0x71, 0x92, 0x00, 0x00, 0x4b, 0x50, 0x90, 0x0b,
+ 0x0c, 0x00, 0x00, 0x00, 0x71, 0x92, 0x00, 0x00,
+ 0x04, 0x00, 0x4c, 0x00, 0x78, 0x92, 0x00, 0x00,
+ 0x7c, 0x92, 0x00, 0x00, 0xb0, 0xb7, 0x24, 0x30,
+ 0x15, 0x00, 0x00, 0x00, 0x7c, 0x92, 0x00, 0x00,
+ 0x06, 0x00, 0x4c, 0x00, 0x84, 0x92, 0x00, 0x00,
+ 0x88, 0x92, 0x00, 0x00, 0x76, 0x66, 0x6f, 0x6c,
0x64, 0x65, 0x72, 0x2e, 0x73, 0x6f, 0x75, 0x72,
0x63, 0x65, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0xe4, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -1395,18 +1395,178 @@
0x75, 0x75, 0x61, 0x79, 0x29, 0x67, 0x6f, 0x6f,
0x67, 0x6c, 0x65, 0x2d, 0x73, 0x74, 0x75, 0x62,
0x2e, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x00,
- 0x37, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x3d, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x0a, 0x5b, 0x44, 0x61, 0x74, 0x61, 0x20, 0x53,
0x6f, 0x75, 0x72, 0x63, 0x65, 0x5d, 0x0a, 0x44,
0x69, 0x73, 0x70, 0x6c, 0x61, 0x79, 0x4e, 0x61,
0x6d, 0x65, 0x3d, 0x47, 0x6f, 0x6f, 0x67, 0x6c,
- 0x65, 0x0a, 0x45, 0x6e, 0x61, 0x62, 0x6c, 0x65,
- 0x64, 0x3d, 0x74, 0x72, 0x75, 0x65, 0x0a, 0x50,
- 0x61, 0x72, 0x65, 0x6e, 0x74, 0x3d, 0x0a, 0x00,
- 0x00, 0x28, 0x75, 0x75, 0x61, 0x79, 0x29, 0x73,
- 0x79, 0x73, 0x74, 0x65, 0x6d, 0x2d, 0x70, 0x72,
- 0x6f, 0x78, 0x79, 0x2e, 0x73, 0x6f, 0x75, 0x72,
- 0x63, 0x65, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x65, 0x0a, 0x44, 0x69, 0x73, 0x70, 0x6c, 0x61,
+ 0x79, 0x4e, 0x61, 0x6d, 0x65, 0x5b, 0x61, 0x73,
+ 0x5d, 0x3d, 0x47, 0x6f, 0x6f, 0x67, 0x6c, 0x65,
+ 0x0a, 0x44, 0x69, 0x73, 0x70, 0x6c, 0x61, 0x79,
+ 0x4e, 0x61, 0x6d, 0x65, 0x5b, 0x62, 0x65, 0x5d,
+ 0x3d, 0x47, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x0a,
+ 0x44, 0x69, 0x73, 0x70, 0x6c, 0x61, 0x79, 0x4e,
+ 0x61, 0x6d, 0x65, 0x5b, 0x62, 0x67, 0x5d, 0x3d,
+ 0x47, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x0a, 0x44,
+ 0x69, 0x73, 0x70, 0x6c, 0x61, 0x79, 0x4e, 0x61,
+ 0x6d, 0x65, 0x5b, 0x62, 0x6e, 0x5f, 0x49, 0x4e,
+ 0x5d, 0x3d, 0x47, 0x6f, 0x6f, 0x67, 0x6c, 0x65,
+ 0x0a, 0x44, 0x69, 0x73, 0x70, 0x6c, 0x61, 0x79,
+ 0x4e, 0x61, 0x6d, 0x65, 0x5b, 0x62, 0x73, 0x5d,
+ 0x3d, 0x47, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x0a,
+ 0x44, 0x69, 0x73, 0x70, 0x6c, 0x61, 0x79, 0x4e,
+ 0x61, 0x6d, 0x65, 0x5b, 0x63, 0x61, 0x5d, 0x3d,
+ 0x47, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x0a, 0x44,
+ 0x69, 0x73, 0x70, 0x6c, 0x61, 0x79, 0x4e, 0x61,
+ 0x6d, 0x65, 0x5b, 0x63, 0x61, 0x40, 0x76, 0x61,
+ 0x6c, 0x65, 0x6e, 0x63, 0x69, 0x61, 0x5d, 0x3d,
+ 0x47, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x0a, 0x44,
+ 0x69, 0x73, 0x70, 0x6c, 0x61, 0x79, 0x4e, 0x61,
+ 0x6d, 0x65, 0x5b, 0x63, 0x73, 0x5d, 0x3d, 0x47,
+ 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x0a, 0x44, 0x69,
+ 0x73, 0x70, 0x6c, 0x61, 0x79, 0x4e, 0x61, 0x6d,
+ 0x65, 0x5b, 0x64, 0x61, 0x5d, 0x3d, 0x47, 0x6f,
+ 0x6f, 0x67, 0x6c, 0x65, 0x0a, 0x44, 0x69, 0x73,
+ 0x70, 0x6c, 0x61, 0x79, 0x4e, 0x61, 0x6d, 0x65,
+ 0x5b, 0x64, 0x65, 0x5d, 0x3d, 0x47, 0x6f, 0x6f,
+ 0x67, 0x6c, 0x65, 0x0a, 0x44, 0x69, 0x73, 0x70,
+ 0x6c, 0x61, 0x79, 0x4e, 0x61, 0x6d, 0x65, 0x5b,
+ 0x65, 0x6c, 0x5d, 0x3d, 0x47, 0x6f, 0x6f, 0x67,
+ 0x6c, 0x65, 0x0a, 0x44, 0x69, 0x73, 0x70, 0x6c,
+ 0x61, 0x79, 0x4e, 0x61, 0x6d, 0x65, 0x5b, 0x65,
+ 0x6e, 0x5f, 0x47, 0x42, 0x5d, 0x3d, 0x47, 0x6f,
+ 0x6f, 0x67, 0x6c, 0x65, 0x0a, 0x44, 0x69, 0x73,
+ 0x70, 0x6c, 0x61, 0x79, 0x4e, 0x61, 0x6d, 0x65,
+ 0x5b, 0x65, 0x73, 0x5d, 0x3d, 0x47, 0x6f, 0x6f,
+ 0x67, 0x6c, 0x65, 0x0a, 0x44, 0x69, 0x73, 0x70,
+ 0x6c, 0x61, 0x79, 0x4e, 0x61, 0x6d, 0x65, 0x5b,
+ 0x65, 0x75, 0x5d, 0x3d, 0x47, 0x6f, 0x6f, 0x67,
+ 0x6c, 0x65, 0x0a, 0x44, 0x69, 0x73, 0x70, 0x6c,
+ 0x61, 0x79, 0x4e, 0x61, 0x6d, 0x65, 0x5b, 0x66,
+ 0x69, 0x5d, 0x3d, 0x47, 0x6f, 0x6f, 0x67, 0x6c,
+ 0x65, 0x0a, 0x44, 0x69, 0x73, 0x70, 0x6c, 0x61,
+ 0x79, 0x4e, 0x61, 0x6d, 0x65, 0x5b, 0x66, 0x72,
+ 0x5d, 0x3d, 0x47, 0x6f, 0x6f, 0x67, 0x6c, 0x65,
+ 0x0a, 0x44, 0x69, 0x73, 0x70, 0x6c, 0x61, 0x79,
+ 0x4e, 0x61, 0x6d, 0x65, 0x5b, 0x67, 0x6c, 0x5d,
+ 0x3d, 0x47, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x0a,
+ 0x44, 0x69, 0x73, 0x70, 0x6c, 0x61, 0x79, 0x4e,
+ 0x61, 0x6d, 0x65, 0x5b, 0x67, 0x75, 0x5d, 0x3d,
+ 0x47, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x0a, 0x44,
+ 0x69, 0x73, 0x70, 0x6c, 0x61, 0x79, 0x4e, 0x61,
+ 0x6d, 0x65, 0x5b, 0x68, 0x69, 0x5d, 0x3d, 0xe0,
+ 0xa4, 0x97, 0xe0, 0xa5, 0x82, 0xe0, 0xa4, 0x97,
+ 0xe0, 0xa4, 0xb2, 0x0a, 0x44, 0x69, 0x73, 0x70,
+ 0x6c, 0x61, 0x79, 0x4e, 0x61, 0x6d, 0x65, 0x5b,
+ 0x68, 0x75, 0x5d, 0x3d, 0x47, 0x6f, 0x6f, 0x67,
+ 0x6c, 0x65, 0x0a, 0x44, 0x69, 0x73, 0x70, 0x6c,
+ 0x61, 0x79, 0x4e, 0x61, 0x6d, 0x65, 0x5b, 0x69,
+ 0x64, 0x5d, 0x3d, 0x47, 0x6f, 0x6f, 0x67, 0x6c,
+ 0x65, 0x0a, 0x44, 0x69, 0x73, 0x70, 0x6c, 0x61,
+ 0x79, 0x4e, 0x61, 0x6d, 0x65, 0x5b, 0x69, 0x74,
+ 0x5d, 0x3d, 0x47, 0x6f, 0x6f, 0x67, 0x6c, 0x65,
+ 0x0a, 0x44, 0x69, 0x73, 0x70, 0x6c, 0x61, 0x79,
+ 0x4e, 0x61, 0x6d, 0x65, 0x5b, 0x6a, 0x61, 0x5d,
+ 0x3d, 0x47, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x0a,
+ 0x44, 0x69, 0x73, 0x70, 0x6c, 0x61, 0x79, 0x4e,
+ 0x61, 0x6d, 0x65, 0x5b, 0x6b, 0x6b, 0x5d, 0x3d,
+ 0x47, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x0a, 0x44,
+ 0x69, 0x73, 0x70, 0x6c, 0x61, 0x79, 0x4e, 0x61,
+ 0x6d, 0x65, 0x5b, 0x6b, 0x6e, 0x5d, 0x3d, 0xe0,
+ 0xb2, 0x97, 0xe0, 0xb3, 0x82, 0xe0, 0xb2, 0x97,
+ 0xe0, 0xb2, 0xb2, 0xe0, 0xb3, 0x8d, 0x0a, 0x44,
+ 0x69, 0x73, 0x70, 0x6c, 0x61, 0x79, 0x4e, 0x61,
+ 0x6d, 0x65, 0x5b, 0x6b, 0x6f, 0x5d, 0x3d, 0xea,
+ 0xb5, 0xac, 0xea, 0xb8, 0x80, 0x0a, 0x44, 0x69,
+ 0x73, 0x70, 0x6c, 0x61, 0x79, 0x4e, 0x61, 0x6d,
+ 0x65, 0x5b, 0x6c, 0x74, 0x5d, 0x3d, 0x47, 0x6f,
+ 0x6f, 0x67, 0x6c, 0x65, 0x0a, 0x44, 0x69, 0x73,
+ 0x70, 0x6c, 0x61, 0x79, 0x4e, 0x61, 0x6d, 0x65,
+ 0x5b, 0x6c, 0x76, 0x5d, 0x3d, 0x47, 0x6f, 0x6f,
+ 0x67, 0x6c, 0x65, 0x0a, 0x44, 0x69, 0x73, 0x70,
+ 0x6c, 0x61, 0x79, 0x4e, 0x61, 0x6d, 0x65, 0x5b,
+ 0x6d, 0x72, 0x5d, 0x3d, 0xe0, 0xa4, 0x97, 0xe0,
+ 0xa5, 0x82, 0xe0, 0xa4, 0x97, 0xe0, 0xa4, 0xb2,
+ 0x0a, 0x44, 0x69, 0x73, 0x70, 0x6c, 0x61, 0x79,
+ 0x4e, 0x61, 0x6d, 0x65, 0x5b, 0x6e, 0x62, 0x5d,
+ 0x3d, 0x47, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x0a,
+ 0x44, 0x69, 0x73, 0x70, 0x6c, 0x61, 0x79, 0x4e,
+ 0x61, 0x6d, 0x65, 0x5b, 0x6e, 0x6c, 0x5d, 0x3d,
+ 0x47, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x0a, 0x44,
+ 0x69, 0x73, 0x70, 0x6c, 0x61, 0x79, 0x4e, 0x61,
+ 0x6d, 0x65, 0x5b, 0x6f, 0x63, 0x5d, 0x3d, 0x47,
+ 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x0a, 0x44, 0x69,
+ 0x73, 0x70, 0x6c, 0x61, 0x79, 0x4e, 0x61, 0x6d,
+ 0x65, 0x5b, 0x6f, 0x72, 0x5d, 0x3d, 0x47, 0x6f,
+ 0x6f, 0x67, 0x6c, 0x65, 0x0a, 0x44, 0x69, 0x73,
+ 0x70, 0x6c, 0x61, 0x79, 0x4e, 0x61, 0x6d, 0x65,
+ 0x5b, 0x70, 0x6c, 0x5d, 0x3d, 0x47, 0x6f, 0x6f,
+ 0x67, 0x6c, 0x65, 0x0a, 0x44, 0x69, 0x73, 0x70,
+ 0x6c, 0x61, 0x79, 0x4e, 0x61, 0x6d, 0x65, 0x5b,
+ 0x70, 0x74, 0x5d, 0x3d, 0x47, 0x6f, 0x6f, 0x67,
+ 0x6c, 0x65, 0x0a, 0x44, 0x69, 0x73, 0x70, 0x6c,
+ 0x61, 0x79, 0x4e, 0x61, 0x6d, 0x65, 0x5b, 0x70,
+ 0x74, 0x5f, 0x42, 0x52, 0x5d, 0x3d, 0x47, 0x6f,
+ 0x6f, 0x67, 0x6c, 0x65, 0x0a, 0x44, 0x69, 0x73,
+ 0x70, 0x6c, 0x61, 0x79, 0x4e, 0x61, 0x6d, 0x65,
+ 0x5b, 0x72, 0x75, 0x5d, 0x3d, 0x47, 0x6f, 0x6f,
+ 0x67, 0x6c, 0x65, 0x0a, 0x44, 0x69, 0x73, 0x70,
+ 0x6c, 0x61, 0x79, 0x4e, 0x61, 0x6d, 0x65, 0x5b,
+ 0x73, 0x6b, 0x5d, 0x3d, 0x47, 0x6f, 0x6f, 0x67,
+ 0x6c, 0x65, 0x0a, 0x44, 0x69, 0x73, 0x70, 0x6c,
+ 0x61, 0x79, 0x4e, 0x61, 0x6d, 0x65, 0x5b, 0x73,
+ 0x6c, 0x5d, 0x3d, 0x47, 0x6f, 0x6f, 0x67, 0x6c,
+ 0x65, 0x0a, 0x44, 0x69, 0x73, 0x70, 0x6c, 0x61,
+ 0x79, 0x4e, 0x61, 0x6d, 0x65, 0x5b, 0x73, 0x72,
+ 0x5d, 0x3d, 0xd0, 0x93, 0xd1, 0x83, 0xd0, 0xb3,
+ 0xd0, 0xbb, 0x0a, 0x44, 0x69, 0x73, 0x70, 0x6c,
+ 0x61, 0x79, 0x4e, 0x61, 0x6d, 0x65, 0x5b, 0x73,
+ 0x72, 0x40, 0x6c, 0x61, 0x74, 0x69, 0x6e, 0x5d,
+ 0x3d, 0x47, 0x75, 0x67, 0x6c, 0x0a, 0x44, 0x69,
+ 0x73, 0x70, 0x6c, 0x61, 0x79, 0x4e, 0x61, 0x6d,
+ 0x65, 0x5b, 0x73, 0x76, 0x5d, 0x3d, 0x47, 0x6f,
+ 0x6f, 0x67, 0x6c, 0x65, 0x0a, 0x44, 0x69, 0x73,
+ 0x70, 0x6c, 0x61, 0x79, 0x4e, 0x61, 0x6d, 0x65,
+ 0x5b, 0x74, 0x61, 0x5d, 0x3d, 0x47, 0x6f, 0x6f,
+ 0x67, 0x6c, 0x65, 0x0a, 0x44, 0x69, 0x73, 0x70,
+ 0x6c, 0x61, 0x79, 0x4e, 0x61, 0x6d, 0x65, 0x5b,
+ 0x74, 0x65, 0x5d, 0x3d, 0xe0, 0xb0, 0x97, 0xe0,
+ 0xb1, 0x82, 0xe0, 0xb0, 0x97, 0xe0, 0xb1, 0x81,
+ 0xe0, 0xb0, 0xb2, 0xe0, 0xb1, 0x8d, 0x0a, 0x44,
+ 0x69, 0x73, 0x70, 0x6c, 0x61, 0x79, 0x4e, 0x61,
+ 0x6d, 0x65, 0x5b, 0x74, 0x68, 0x5d, 0x3d, 0xe0,
+ 0xb8, 0x81, 0xe0, 0xb8, 0xb9, 0xe0, 0xb9, 0x80,
+ 0xe0, 0xb8, 0x81, 0xe0, 0xb8, 0xb4, 0xe0, 0xb8,
+ 0xa5, 0x0a, 0x44, 0x69, 0x73, 0x70, 0x6c, 0x61,
+ 0x79, 0x4e, 0x61, 0x6d, 0x65, 0x5b, 0x74, 0x72,
+ 0x5d, 0x3d, 0x47, 0x6f, 0x6f, 0x67, 0x6c, 0x65,
+ 0x0a, 0x44, 0x69, 0x73, 0x70, 0x6c, 0x61, 0x79,
+ 0x4e, 0x61, 0x6d, 0x65, 0x5b, 0x75, 0x67, 0x5d,
+ 0x3d, 0xda, 0xaf, 0xdb, 0x87, 0xda, 0xaf, 0xd9,
+ 0x89, 0xd9, 0x84, 0x28, 0x47, 0x6f, 0x6f, 0x67,
+ 0x6c, 0x65, 0x29, 0x0a, 0x44, 0x69, 0x73, 0x70,
+ 0x6c, 0x61, 0x79, 0x4e, 0x61, 0x6d, 0x65, 0x5b,
+ 0x75, 0x6b, 0x5d, 0x3d, 0x47, 0x6f, 0x6f, 0x67,
+ 0x6c, 0x65, 0x0a, 0x44, 0x69, 0x73, 0x70, 0x6c,
+ 0x61, 0x79, 0x4e, 0x61, 0x6d, 0x65, 0x5b, 0x76,
+ 0x69, 0x5d, 0x3d, 0x47, 0x6f, 0x6f, 0x67, 0x6c,
+ 0x65, 0x0a, 0x44, 0x69, 0x73, 0x70, 0x6c, 0x61,
+ 0x79, 0x4e, 0x61, 0x6d, 0x65, 0x5b, 0x7a, 0x68,
+ 0x5f, 0x43, 0x4e, 0x5d, 0x3d, 0x47, 0x6f, 0x6f,
+ 0x67, 0x6c, 0x65, 0x0a, 0x44, 0x69, 0x73, 0x70,
+ 0x6c, 0x61, 0x79, 0x4e, 0x61, 0x6d, 0x65, 0x5b,
+ 0x7a, 0x68, 0x5f, 0x48, 0x4b, 0x5d, 0x3d, 0x47,
+ 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x0a, 0x44, 0x69,
+ 0x73, 0x70, 0x6c, 0x61, 0x79, 0x4e, 0x61, 0x6d,
+ 0x65, 0x5b, 0x7a, 0x68, 0x5f, 0x54, 0x57, 0x5d,
+ 0x3d, 0x47, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x0a,
+ 0x45, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x64, 0x3d,
+ 0x74, 0x72, 0x75, 0x65, 0x0a, 0x50, 0x61, 0x72,
+ 0x65, 0x6e, 0x74, 0x3d, 0x0a, 0x00, 0x00, 0x28,
+ 0x75, 0x75, 0x61, 0x79, 0x29, 0x73, 0x79, 0x73,
+ 0x74, 0x65, 0x6d, 0x2d, 0x70, 0x72, 0x6f, 0x78,
+ 0x79, 0x2e, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65,
0x86, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x0a, 0x5b, 0x44, 0x61, 0x74, 0x61, 0x20, 0x53,
0x6f, 0x75, 0x72, 0x63, 0x65, 0x5d, 0x0a, 0x44,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/evolution-data-server-3.18.2/tests/libebook-contacts/test-vcard-parsing.c
new/evolution-data-server-3.18.3/tests/libebook-contacts/test-vcard-parsing.c
---
old/evolution-data-server-3.18.2/tests/libebook-contacts/test-vcard-parsing.c
2015-09-21 11:19:52.000000000 +0200
+++
new/evolution-data-server-3.18.3/tests/libebook-contacts/test-vcard-parsing.c
2015-11-19 09:07:22.000000000 +0100
@@ -460,8 +460,8 @@
g_test_add_func ("/Parsing/VCard/WithUID", test_vcard_with_uid);
g_test_add_func ("/Parsing/VCard/WithoutUID", test_vcard_without_uid);
- g_test_add_func ("/Parsing/VCard/WithUID", test_contact_with_uid);
- g_test_add_func ("/Parsing/VCard/WithoutUID", test_contact_without_uid);
+ g_test_add_func ("/Parsing/Contact/WithUID", test_contact_with_uid);
+ g_test_add_func ("/Parsing/Contact/WithoutUID",
test_contact_without_uid);
g_test_add_func ("/Parsing/VCard/QuotedPrintable",
test_vcard_quoted_printable);
g_test_add_func ("/Construction/VCardAttribute/WithGroup",
test_construction_vcard_attribute_with_group);
