Changeset 2493

Timestamp:

07/10/07 13:57:34 (6 years ago)

Author:

njp

Message:

2007-07-10 Neil J. Patel <njp@…>

• src/moko-contacts.c: (moko_contacts_add_contact), (on_ebook_contact_added), (moko_contacts_init), (moko_contacts_get_default):
• src/moko-contacts.h: Create the EBook and populate the contacts and entries list. Connect to the 'contacts-added' signal and add new contacts to the list.

Location:

trunk/applications/openmoko-dialer

Files:

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

trunk/applications/openmoko-dialer/ChangeLog

@@ +1 @@
+2007-07-10  Neil J. Patel  <njp@o-hand.com>
+
+        * src/moko-contacts.c: (moko_contacts_add_contact),
+        (on_ebook_contact_added), (moko_contacts_init),
+        (moko_contacts_get_default):
+        * src/moko-contacts.h:
+        Create the EBook and populate the contacts and entries list.
+        Connect to the 'contacts-added' signal and add new contacts to the list.
+
 2007-07-09  Neil J. Patel  <njp@o-hand.com>
 

trunk/applications/openmoko-dialer/src/moko-contacts.c

@@ -1 +1 @@
 /*
- *  moko-contacts; The contactss contacts
+ *  moko-contacts; A rework of the dialers contact list, some e-book code taken
+ *  from the orignal dialer contacts.c (written by tonyguan@fic-sh.com.cn)
  *
  *  Authored by OpenedHand Ltd <info@openedhand.com>
@@ -18 +19 @@
  */
 
-#include <gtk/gtk.h>
-#include <gtk/gtk.h>
+#include <glib.h>
+
+#include <libebook/e-book.h>
 
 #include "moko-contacts.h"
@@ -30 +32 @@
 struct _MokoContactsPrivate
 {
-  gint null;
+  GList *contacts;
+  GList *entries;
 };
+
+static void
+moko_contacts_add_contact (MokoContacts *contacts, EContact *e_contact)
+{
+  MokoContactsPrivate *priv;
+  MokoContact *m_contact = NULL;
+  const gchar *name;
+  gint         i;
+
+  g_return_if_fail (MOKO_IS_CONTACTS (contacts));
+  g_return_if_fail (E_IS_CONTACT (e_contact));
+  priv = contacts->priv;
+
+  name = e_contact_get_const (e_contact, E_CONTACT_NAME_OR_ORG);
+  if (!name || (g_utf8_strlen (name, -1) <= 0))
+    name = "Unnamed";
+    
+  /* Create the contact & append to the list */
+  m_contact = g_new0 (MokoContact, 1);
+  m_contact->name = g_strdup (name);
+  m_contact->uid = e_contact_get (e_contact, E_CONTACT_UID);
+  m_contact->photo = NULL;
+
+  priv->contacts = g_list_append (priv->contacts, m_contact);
+   
+  /* Now go through the numbers,creating MokoNumber for them */
+  for (i = E_CONTACT_FIRST_PHONE_ID; i < E_CONTACT_LAST_PHONE_ID; i++)
+  {
+    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 = g_strdup (phone);
+      entry->contact = m_contact;
+
+      priv->entries = g_list_append (priv->entries, (gpointer)entry);
+    }
+  }
+}
+
+static void
+on_ebook_contact_added (EBookView    *view, 
+                        GList        *c_list, 
+                        MokoContacts *contacts)
+{
+  MokoContactsPrivate *priv;
+  GList *c;
+
+  g_return_if_fail (MOKO_IS_CONTACTS (contacts));
+  priv = contacts->priv;
+
+  for (c = c_list; c != NULL; c = c->next)
+    moko_contacts_add_contact (contacts, E_CONTACT (c->data));
+}
 
 /* GObject functions */
@@ -58 +119 @@
 }
 
+
 static void
 moko_contacts_init (MokoContacts *contacts)
 {
   MokoContactsPrivate *priv;
+  EBook *book;
+  EBookView *view;
+  EBookQuery *query;
+  GList *contact, *c;
 
   priv = contacts->priv = MOKO_CONTACTS_GET_PRIVATE (contacts);
+
+  priv->contacts = priv->entries = NULL;
+
+  query = e_book_query_any_field_contains ("");
+
+  /* Open the system book and check that it is valid */
+  book = e_book_new_system_addressbook (NULL);
+  if (!book)
+  {
+    g_warning ("Failed to create system book\n");
+    return;
+  }
+  if (!e_book_open (book, TRUE, NULL))
+  {
+    g_warning ("Failed to open system book\n");
+    return;
+  }
+  if (!e_book_get_contacts (book, query, &contact, NULL))
+  {
+    g_warning ("Failed to get contacts from system book\n");
+    return;
+  }
+  
+  /* Go through the contacts, creating the contact structs, and entry structs*/
+  for (c = contact; c != NULL; c = c->next)
+  {
+    moko_contacts_add_contact (contacts, E_CONTACT (c->data));
+  }
+
+  /* Connect to contact added signals */
+  if (e_book_get_book_view (book, query, NULL, 0, &view, NULL))
+  {
+    g_signal_connect (G_OBJECT (view), "contacts-added",
+                      G_CALLBACK (on_ebook_contact_added), (gpointer)contacts);
+  }
 }
 
@@ -71 +172 @@
   static MokoContacts *contacts = NULL;
   
-  if (contacts = NULL)
+  if (contacts == NULL)
     contacts = g_object_new (MOKO_TYPE_CONTACTS, 
                              NULL);

trunk/applications/openmoko-dialer/src/moko-contacts.h

@@ -1 +1 @@
 /*
- *  moko-contacts; The contactss contacts.
+ *  moko-contacts; A rework of the dialers contact list, some e-book code taken
+ *  from the orignal dialer contacts.c (written by tonyguan@fic-sh.com.cn)
  *
  *  Authored by OpenedHand Ltd <info@openedhand.com>
@@ -22 +23 @@
 
 #include <glib.h>
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS
@@ -45 +47 @@
 typedef struct _MokoContactsClass MokoContactsClass;
 typedef struct _MokoContactsPrivate MokoContactsPrivate;
+typedef struct _MokoContact MokoContact;
+typedef struct _MokoContactEntry MokoContactEntry;
 
 struct _MokoContacts
@@ -64 +68 @@
   void (*_moko_contacts_3) (void);
   void (*_moko_contacts_4) (void);
-}; 
+};
+
+struct _MokoContact
+{
+  gchar       *uid;
+  gchar       *name;
+  GdkPixbuf   *photo;
+};
+
+struct _MokoContactEntry
+{
+  gchar       *desc;
+  gchar       *number;
+  MokoContact *contact;
+};
 
 GType moko_contacts_get_type (void) G_GNUC_CONST;
@@ -71 +89 @@
 moko_contacts_get_default (void);
 
+MokoContactEntry*
+moko_contacts_lookup (MokoContacts *contacts, const gchar *number);
+
 G_END_DECLS