Merged from silc_1_0_branch.

[silc.git] / lib / silcutil / silcvcard.c

diff --git a/lib/silcutil/silcvcard.c b/lib/silcutil/silcvcard.c
index d4864629967d3bb1a8a3ed4be4eb0c3c238346ce..a6d6fd5bd655e33ccbdf99bf51241553e31a5b4e 100644 (file)
--- a/lib/silcutil/silcvcard.c
+++ b/lib/silcutil/silcvcard.c
@@ -69,9 +69,9 @@ unsigned char *silc_vcard_encode(SilcVCard vcard, SilcUInt32 *vcard_len)
     silc_buffer_strformat(&buffer,
                          "CATEGORIES:", vcard->categories, "\n",
                          SILC_STR_END);
-  if (vcard->class)
+  if (vcard->catclass)
     silc_buffer_strformat(&buffer,
-                         "CLASS:", vcard->class, "\n",
+                         "CLASS:", vcard->catclass, "\n",
                          SILC_STR_END);
   if (vcard->url)
     silc_buffer_strformat(&buffer,
@@ -98,7 +98,7 @@ unsigned char *silc_vcard_encode(SilcVCard vcard, SilcUInt32 *vcard_len)
     silc_buffer_strformat(&buffer,
                          "TEL;TYPE=",
                          vcard->tels[i].type, ":",
-                         vcard->tels[i].tel, "\n",
+                         vcard->tels[i].telnum, "\n",
                          SILC_STR_END);
   }
   for (i = 0; i < vcard->num_emails; i++) {
@@ -204,7 +204,7 @@ bool silc_vcard_decode(const unsigned char *data, SilcUInt32 data_len,
     VCARD_FIELD(val, "TITLE:", vcard->title);
     VCARD_FIELD(val, "ROLE:", vcard->role);
     VCARD_FIELD(val, "CATEGORIES:", vcard->categories);
-    VCARD_FIELD(val, "CLASS:", vcard->class);
+    VCARD_FIELD(val, "CLASS:", vcard->catclass);
     VCARD_FIELD(val, "URL:", vcard->url);
     VCARD_FIELD(val, "LABEL;", vcard->label);
     VCARD_FIELD(val, "NOTE:", vcard->note);
@@ -292,7 +292,7 @@ bool silc_vcard_decode(const unsigned char *data, SilcUInt32 data_len,
            VCARD_TYPETOKEN(vcard->tels[vcard->num_tels].type);
            break;
          }
-       VCARD_LASTTOKEN(vcard->tels[vcard->num_tels].tel);
+       VCARD_LASTTOKEN(vcard->tels[vcard->num_tels].telnum);
       }
       vcard->num_tels++;
       goto next;
@@ -363,7 +363,7 @@ void silc_vcard_free(SilcVCard vcard)
   silc_free(vcard->org_name);
   silc_free(vcard->org_unit);
   silc_free(vcard->categories);
-  silc_free(vcard->class);
+  silc_free(vcard->catclass);
   silc_free(vcard->url);
   silc_free(vcard->label);
   for (i = 0; i < vcard->num_addrs; i++) {
@@ -379,7 +379,7 @@ void silc_vcard_free(SilcVCard vcard)
   silc_free(vcard->addrs);
   for (i = 0; i < vcard->num_tels; i++) {
     silc_free(vcard->tels[i].type);
-    silc_free(vcard->tels[i].tel);
+    silc_free(vcard->tels[i].telnum);
   }
   silc_free(vcard->tels);
   for (i = 0; i < vcard->num_emails; i++) {
@@ -427,8 +427,8 @@ void silc_vcard_fprintf(SilcVCard vcard, FILE *stream)
            vcard->org_unit ? vcard->org_unit : "");
   if (vcard->categories)
     fprintf(stream, "CATEGORIES:%s\n", vcard->categories);
-  if (vcard->class)
-    fprintf(stream, "CLASS:%s\n", vcard->class);
+  if (vcard->catclass)
+    fprintf(stream, "CLASS:%s\n", vcard->catclass);
   if (vcard->url)
     fprintf(stream, "URL:%s\n", vcard->url);
   if (vcard->label)
@@ -447,7 +447,7 @@ void silc_vcard_fprintf(SilcVCard vcard, FILE *stream)
   for (i = 0; i < vcard->num_tels; i++) {
     fprintf(stream, "TEL;TYPE=%s:%s\n",
            vcard->tels[i].type,
-           vcard->tels[i].tel ? vcard->tels[i].tel : "");
+           vcard->tels[i].telnum ? vcard->tels[i].telnum : "");
   }
   for (i = 0; i < vcard->num_emails; i++) {
     fprintf(stream, "EMAIL;TYPE=%s:%s\n",