Changeset 3073

Timestamp:

10/02/07 17:01:27 (6 years ago)

Author:

thomas

Message:

Patch by: Roman Moravcik <roman.moravcik@…>

• src/moko-contacts.c: (moko_contacts_add_contact): Read phone number from

VCARD.

Location:

trunk/src/target/OM-2007.2/applications/openmoko-dialer2

Files:

• ChangeLog (modified) (1 diff)
• src/moko-contacts.c (modified) (2 diffs)

trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog

@@ +1 @@
+2007-10-02  Thomas Wood  <thomas@openedhand.com>
+
+        Patch by: Roman Moravcik <roman.moravcik@gmail.com>
+
+        * src/moko-contacts.c: (moko_contacts_add_contact): Read phone number from
+        VCARD.
+
 2007-10-02  Thomas Wood  <thomas@openedhand.com>
 

trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/moko-contacts.c

@@ -249 +249 @@
   MokoContact *m_contact = NULL;
   const gchar *name;
-  gint         i;
+  GList *attributes, *params, *numbers;
 
   g_return_if_fail (MOKO_IS_CONTACTS (contacts));
@@ -268 +268 @@
    
   /* Now go through the numbers,creating MokoNumber for them */
-  for (i = E_CONTACT_FIRST_PHONE_ID; i < E_CONTACT_LAST_PHONE_ID; i++)
+  for (attributes = e_vcard_get_attributes (E_VCARD(e_contact)); attributes; attributes = attributes->next)
   {
     MokoContactEntry  *entry;
     const gchar *phone;
-
-    phone = e_contact_get_const (e_contact, i);
-    if (phone)
-    {
-      entry = g_new0 (MokoContactEntry, 1);
-      entry->desc = g_strdup (e_contact_field_name (i));
-      entry->number = normalize (phone);
-      entry->contact = m_contact;
-
-      priv->entries = g_list_append (priv->entries, (gpointer)entry);
-      g_hash_table_insert (priv->prefixes, 
-                           g_strdup (entry->number), 
-                           (gpointer)entry);
-      add_number (&priv->start, entry);
+    const char *attr;
+
+    attr = e_vcard_attribute_get_name (attributes->data);
+    if (!strcmp (attr, EVC_TEL))
+    {
+      for (numbers = e_vcard_attribute_get_values (attributes->data); numbers; numbers = numbers->next)
+      {
+        phone = g_strdup (numbers->data);
+         if (phone)
+        {
+          entry = g_new0 (MokoContactEntry, 1);
+
+          params = e_vcard_attribute_get_param (attributes->data, "TYPE");
+          if (params)
+            entry->desc = g_strdup (params->data);
+
+          entry->desc = g_strdup (params->data);
+          entry->number = normalize (phone);
+          entry->contact = m_contact;
+
+          priv->entries = g_list_append (priv->entries, (gpointer)entry);
+          g_hash_table_insert (priv->prefixes, 
+                               g_strdup (entry->number), 
+                               (gpointer)entry);
+          add_number (&priv->start, entry);
+        }
+      }
     }
   }