Changeset 1356

Timestamp:

09/13/06 18:29:47 (2 years ago)

Author:

cstender

Message:

Added encoding support in organization hook (XMPM
062-encoding_in_organization_hook.patch)

Files:

• trunk/formats/vformats-xml/xml-kde.c (modified) (3 diffs)

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

@@ -256 +256 @@
 }
 
+static void add_value_decoded(VFormatAttribute *attr, const char *value, const char *encoding)
+{
+        if (needs_charset((unsigned char*)value))
+                if (!vformat_attribute_has_param (attr, "CHARSET"))
+                        vformat_attribute_add_param_with_value(attr, "CHARSET", "UTF-8");
+        
+        if (needs_encoding((unsigned char*)value, encoding)) {
+                if (!vformat_attribute_has_param (attr, "ENCODING"))
+                        vformat_attribute_add_param_with_value(attr, "ENCODING", encoding);
+                vformat_attribute_add_value_decoded(attr, value, strlen(value) + 1);
+        } else
+                vformat_attribute_add_value(attr, value);
+}
+
 static void add_value(VFormatAttribute *attr, xmlNode *parent, const char *name, const char *encoding)
 {
@@ -261 +275 @@
         if (!tmp)
                 return;
-        
-        if (needs_charset((unsigned char*)tmp))
-                if (!vformat_attribute_has_param (attr, "CHARSET"))
-                        vformat_attribute_add_param_with_value(attr, "CHARSET", "UTF-8");
-        
-        if (needs_encoding((unsigned char*)tmp, encoding)) {
-                if (!vformat_attribute_has_param (attr, "ENCODING"))
-                        vformat_attribute_add_param_with_value(attr, "ENCODING", encoding);
-                vformat_attribute_add_value_decoded(attr, tmp, strlen(tmp) + 1);
-        } else
-                vformat_attribute_add_value(attr, tmp);
+
+        add_value_decoded(attr, tmp, encoding); 
+
         g_free(tmp);
 }
@@ -378 +384 @@
                 if (!strcmp((char*)root->name, "Name")) {
                         org = vformat_attribute_new(NULL, "ORG");
-                        vformat_attribute_add_value(org, content);
+                        add_value_decoded(org, content, encoding);
                         vformat_add_attribute(vcard, org);
                 }