[evolution-data-server/gnome-3-6] Bug #695308 - Migration of broken signature breaks whole migration

[Milan Crha <mcrha src gnome org>]

commit 2501c04c7a84b86ab481b8ea6a6c37d7feb76db4
Author: Milan Crha <mcrha redhat com>
Date:   Thu Mar 7 12:57:19 2013 +0100

    Bug #695308 - Migration of broken signature breaks whole migration

 .../evolution-source-registry-migrate-sources.c    |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)
---
diff --git a/services/evolution-source-registry/evolution-source-registry-migrate-sources.c 
b/services/evolution-source-registry/evolution-source-registry-migrate-sources.c
index 2d695f6..6729af3 100644
--- a/services/evolution-source-registry/evolution-source-registry-migrate-sources.c
+++ b/services/evolution-source-registry/evolution-source-registry-migrate-sources.c
@@ -2161,17 +2161,19 @@ migrate_parse_signature_xml_text (GMarkupParseContext *context,
                parse_data->signature_file = NULL;
 
                /* If the signature is a script, we symlink to it.
-                * Otherwise we move and rename the regular file. */
+                * Otherwise we move and rename the regular file.
+                * Also ignore errors here, otherwise it stops whole migration.
+                */
                if (parse_data->is_script)
                        g_file_make_symbolic_link (
                                new_signature_file,
-                               absolute_path, NULL, error);
+                               absolute_path, NULL, NULL);
                else
                        g_file_move (
                                old_signature_file,
                                new_signature_file,
                                G_FILE_COPY_NONE,
-                               NULL, NULL, NULL, error);
+                               NULL, NULL, NULL, NULL);
 
                g_object_unref (old_signature_file);
                g_object_unref (new_signature_file);