[evolution-data-server/gnome-3-6] Bug 685725 - Handle "muser" attributes in %gconf.xml files

[Matthew Barnes <mbarnes src gnome org>]

commit afd3b7d3ad4c08a4077a3871e3d0d0693fe56cad
Author: Bastien Nocera <hadess hadess net>
Date:   Mon Oct 8 21:06:55 2012 -0400

    Bug 685725 - Handle "muser" attributes in %gconf.xml files
    
    The migration of account data from GConf to key files parses raw
    %gconf.xml files.  The parsing code neglected to handle "muser"
    attributes in <entry> tags, so that when an "muser" attribute was
    encountered, g_markup_collect_attributes() would throw an error an
    cause the whole GConf migration phase to be aborted.
    
    (cherry picked from commit 3fd3ab7dc9933cdac150eccc5d4bc6f2a442b697)

 .../evolution-source-registry-migrate-sources.c    |    3 +++
 1 files changed, 3 insertions(+), 0 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 d590467..f0016b9 100644
--- a/services/evolution-source-registry/evolution-source-registry-migrate-sources.c
+++ b/services/evolution-source-registry/evolution-source-registry-migrate-sources.c
@@ -3183,6 +3183,9 @@ migrate_parse_gconf_xml_start_element (GMarkupParseContext *context,
 			"mtime", NULL,
 			G_MARKUP_COLLECT_STRING |
 			G_MARKUP_COLLECT_OPTIONAL,
+			"muser", NULL,
+			G_MARKUP_COLLECT_STRING |
+			G_MARKUP_COLLECT_OPTIONAL,
 			"type", NULL,
 			G_MARKUP_COLLECT_STRING |
 			G_MARKUP_COLLECT_OPTIONAL,