Changeset 1689

Timestamp:

02/07/07 13:43:37 (2 years ago)

Author:

dgollub

Message:

Fixed #358.
vcard2.1 and vcard3.0 use different format values
for the binary format: B / BASE64
Included attachted patch from #358 for vformat
to handle the base64 stuff.

Files:

• trunk/formats/vformats-xml/vformat.c (modified) (1 diff)
• trunk/formats/vformats-xml/xml-vcard.c (modified) (3 diffs)

trunk/formats/vformats-xml/vformat.c

@@ -1321 +1321 @@
-                        if (!g_ascii_strcasecmp ((char*)param->values->data, "b"))
-                                attr->encoding = VF_ENCODING_BASE64;
+                        else if (!g_ascii_strcasecmp ((char*)param->values->data, "BASE64"))
+                                attr->encoding = VF_ENCODING_BASE64;
-                        else if (!g_ascii_strcasecmp ((char*)param->values->data, "QUOTED-PRINTABLE"))
-                                attr->encoding = VF_ENCODING_QP;

trunk/formats/vformats-xml/xml-vcard.c

@@ -687 +687 @@
-}
-
+static VFormatAttribute *handle_xml_photo_base64_attribute(VFormat *vcard, xmlNode *root, const char *encoding)
+{
+        osync_trace(TRACE_INTERNAL, "Handling photo xml attribute");
+        VFormatAttribute *attr = vformat_attribute_new(NULL, "PHOTO");
+        add_value(attr, root, "Content", encoding);
+        vformat_attribute_add_param_with_value(attr, "ENCODING", "BASE64");
+        vformat_attribute_add_param_with_value(attr, "TYPE", osxml_find_node(root, "Type"));
+        vformat_add_attribute(vcard, attr);
+        return attr;
+}
+
-static VFormatAttribute *handle_xml_birthday_attribute(VFormat *vcard, xmlNode *root, const char *encoding)
-{
@@ -918 +929 @@
-        else
-                std_encoding = "B";
-
+
+
+
+
+
+
+
+
+
-        if (root)
-                root = root->children;
-        while (root) {
-(OSyncHookTables *)user_data
+hooks
-                root = root->next;
-        }
@@ -1048 +1067 @@
-        g_hash_table_insert(hooks->attributes, "Name", handle_xml_name_attribute);
-        g_hash_table_insert(hooks->attributes, "Agent", handle_xml_agent_attribute);
-        g_hash_table_insert(hooks->attributes, "Photo", handle_xml_photo_attribute);
-        g_hash_table_insert(hooks->attributes, "Birthday", handle_xml_birthday_attribute);
-        g_hash_table_insert(hooks->attributes, "Address", handle_xml_address_attribute);