From 8e40f4976a7b7965b5fb3babdae3e4ffc1c03a92 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jos=C3=A9=20Dapena=20Paz?= Date: Tue, 9 Feb 2010 17:56:24 +0100 Subject: [PATCH] Added support for external addressbook Nokia service in hildon (com.nokia.asdbus). Fixes NB#149525. --- configure.ac | 2 + src/dbus_api/Makefile.am | 5 ++ src/dbus_api/asdbus-bindings.h | 80 +++++++++++++++++++++ src/dbus_api/asdbus.c | 78 ++++++++++++++++++++ src/dbus_api/asdbus.h | 8 +++ src/hildon2/modest-address-book.c | 142 +++++++++++++++++++++++++++++++++++-- 6 files changed, 310 insertions(+), 5 deletions(-) create mode 100644 src/dbus_api/asdbus-bindings.h create mode 100644 src/dbus_api/asdbus.c create mode 100644 src/dbus_api/asdbus.h diff --git a/configure.ac b/configure.ac index 9f032d2..dc89a65 100644 --- a/configure.ac +++ b/configure.ac @@ -180,6 +180,8 @@ elif test "$with_platform" = "gnome"; then MODEST_PLUGIN_DEFINES=" -DMODEST_PLATFORM_GNOME -DMODEST_API_VERSION=${MODEST_API_VERSION}" fi AC_SUBST(MODEST_PLUGIN_DEFINES) +AM_CONDITIONAL(MODEST_BUILD_ASDBUS,test "x$with_platform" == "xmaemo") + # # check the widgets library diff --git a/src/dbus_api/Makefile.am b/src/dbus_api/Makefile.am index be23501..3eb1f9f 100644 --- a/src/dbus_api/Makefile.am +++ b/src/dbus_api/Makefile.am @@ -51,6 +51,11 @@ libmodest_dbus_api_la_SOURCES= \ modest-dbus-callbacks.h modest-dbus-callbacks.c \ modest-dbus-api.h +if MODEST_BUILD_ASDBUS +libmodest_dbus_api_la_SOURCES+= \ + asdbus.h asdbus.c asdbus-bindings.h +endif + LDADD = \ $(LIBMODEST_DBUS_CLIENT_LIBS) $(MODEST_GSTUFF_LIBS) \ diff --git a/src/dbus_api/asdbus-bindings.h b/src/dbus_api/asdbus-bindings.h new file mode 100644 index 0000000..64f9aaf --- /dev/null +++ b/src/dbus_api/asdbus-bindings.h @@ -0,0 +1,80 @@ +/* Generated by dbus-binding-tool; + + + + + + + + + + + +*/ + +#include +#include + +G_BEGIN_DECLS + +#ifndef DBUS_GLIB_CLIENT_WRAPPERS_com_nokia_asdbus +#define DBUS_GLIB_CLIENT_WRAPPERS_com_nokia_asdbus + +static +#ifdef G_HAVE_INLINE +inline +#endif +gboolean +com_nokia_asdbus_resolve_recipients (DBusGProxy *proxy, const char ** IN_names, GValueArray** OUT_reply, GError **error) +{ + return dbus_g_proxy_call (proxy, "resolveRecipients", error, + G_TYPE_STRV, IN_names, G_TYPE_INVALID, + dbus_g_type_get_struct ("GValueArray", + G_TYPE_INT, // status + dbus_g_type_get_collection ("GPtrArray", // responces + dbus_g_type_get_struct ("GValueArray", + G_TYPE_STRING, // to + G_TYPE_INT, // status + G_TYPE_INT, // num + dbus_g_type_get_collection ("GPtrArray", // recipients + dbus_g_type_get_struct ("GValueArray", + G_TYPE_INT, + G_TYPE_STRING, + G_TYPE_STRING, + G_TYPE_INVALID)), + G_TYPE_INVALID)), + G_TYPE_INVALID), + OUT_reply, + G_TYPE_INVALID); +} + +typedef void (*com_nokia_asdbus_resolve_recipients_reply) (DBusGProxy *proxy, GValueArray *OUT_reply, GError *error, gpointer userdata); + +static void +com_nokia_asdbus_resolve_recipients_async_callback (DBusGProxy *proxy, DBusGProxyCall *call, void *user_data) +{ + DBusGAsyncData *data = (DBusGAsyncData*) user_data; + GError *error = NULL; + GValueArray* OUT_reply; + dbus_g_proxy_end_call (proxy, call, &error, dbus_g_type_get_struct ("GValueArray", G_TYPE_INT, dbus_g_type_get_collection ("GPtrArray", dbus_g_type_get_struct ("GValueArray", G_TYPE_STRING, G_TYPE_INT, G_TYPE_INT, dbus_g_type_get_collection ("GPtrArray", dbus_g_type_get_struct ("GValueArray", G_TYPE_INT, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_INVALID)), G_TYPE_INVALID)), G_TYPE_INVALID), &OUT_reply, G_TYPE_INVALID); + (*(com_nokia_asdbus_resolve_recipients_reply)data->cb) (proxy, OUT_reply, error, data->userdata); + return; +} + +static +#ifdef G_HAVE_INLINE +inline +#endif +DBusGProxyCall* +com_nokia_asdbus_resolve_recipients_async (DBusGProxy *proxy, const char ** IN_names, com_nokia_asdbus_resolve_recipients_reply callback, gpointer userdata) + +{ + DBusGAsyncData *stuff; + stuff = g_new (DBusGAsyncData, 1); + stuff->cb = G_CALLBACK (callback); + stuff->userdata = userdata; + return dbus_g_proxy_begin_call (proxy, "resolveRecipients", com_nokia_asdbus_resolve_recipients_async_callback, stuff, g_free, G_TYPE_STRV, IN_names, G_TYPE_INVALID); +} +#endif /* defined DBUS_GLIB_CLIENT_WRAPPERS_com_nokia_asdbus */ + +G_END_DECLS diff --git a/src/dbus_api/asdbus.c b/src/dbus_api/asdbus.c new file mode 100644 index 0000000..38aef5f --- /dev/null +++ b/src/dbus_api/asdbus.c @@ -0,0 +1,78 @@ +#include "asdbus.h" +#include "asdbus-bindings.h" + +#include +#include + + +static +void recipient_iter (const GValue *value, gpointer user_data) +{ + AsDbusRecipient *recipient = g_new0 (AsDbusRecipient, 1); + g_return_if_fail (dbus_g_type_is_struct (G_VALUE_TYPE (value))); + g_return_if_fail (3 >= dbus_g_type_get_struct_size (G_VALUE_TYPE (value))); + g_return_if_fail (G_TYPE_STRING == dbus_g_type_get_struct_member_type (G_VALUE_TYPE (value), 1)); + g_return_if_fail (G_TYPE_STRING == dbus_g_type_get_struct_member_type (G_VALUE_TYPE (value), 2)); + g_return_if_fail (dbus_g_type_struct_get (value, + 1, &recipient->display_name, + 2, &recipient->email_address, + G_MAXUINT)); + *((GList **)user_data) = g_list_append (*((GList **)user_data), recipient); +} + + +static +void response_iter (const GValue *value, gpointer user_data) +{ + GValue recipients = {0,}; + g_return_if_fail (dbus_g_type_is_struct (G_VALUE_TYPE (value))); + g_return_if_fail (4 >= dbus_g_type_get_struct_size (G_VALUE_TYPE (value))); + g_return_if_fail (dbus_g_type_is_collection (dbus_g_type_get_struct_member_type (G_VALUE_TYPE (value), 3))); + g_return_if_fail (dbus_g_type_struct_get_member (value, 3, g_value_init (&recipients, dbus_g_type_get_struct_member_type (G_VALUE_TYPE (value), 3)))); + dbus_g_type_collection_value_iterate (&recipients, recipient_iter, user_data); +} + +GList * asdbus_resolve_recipients (const gchar *name) +{ + GList *result = NULL; + DBusGConnection *bus = NULL; + GError *error = NULL; + DBusGProxy *asdbus = NULL; + GValueArray* reply = NULL; + + + ///g_type_init (); + + const gchar *names[2]; + names[0] = name; + names[1] = NULL; + + bus = dbus_g_bus_get (DBUS_BUS_SESSION, &error); + if (bus == NULL) { + /** FIXME: proper log */ + g_printerr ("Failed to open connection to bus: %s\n", error->message); + g_error_free (error); + goto CLEANUP; + } + + asdbus = dbus_g_proxy_new_for_name (bus, "com.nokia.asdbus", "/com/nokia/asdbus", "com.nokia.asdbus"); + + if (!com_nokia_asdbus_resolve_recipients (asdbus, names, &reply, &error)) { + g_printerr ("com_nokia_asdbus_many_args failed: %s\n", error->message); + g_error_free (error); + goto CLEANUP; + } + + if (!reply) goto CLEANUP; + if (2 != reply->n_values) goto CLEANUP; + if (G_TYPE_INT != G_VALUE_TYPE (&reply->values[0])) goto CLEANUP; + if (!dbus_g_type_is_collection (G_VALUE_TYPE (&reply->values[1]))) goto CLEANUP; + + dbus_g_type_collection_value_iterate (&reply->values[1], response_iter, &result); + +CLEANUP: + g_value_array_free (reply); + g_object_unref (asdbus); + + return result; +} diff --git a/src/dbus_api/asdbus.h b/src/dbus_api/asdbus.h new file mode 100644 index 0000000..588fbff --- /dev/null +++ b/src/dbus_api/asdbus.h @@ -0,0 +1,8 @@ +#include + +typedef struct { + gchar *display_name; + gchar *email_address; +} AsDbusRecipient; + +GList * asdbus_resolve_recipients (const gchar *name); diff --git a/src/hildon2/modest-address-book.c b/src/hildon2/modest-address-book.c index 8cb2e36..9da5e18 100644 --- a/src/hildon2/modest-address-book.c +++ b/src/hildon2/modest-address-book.c @@ -51,6 +51,9 @@ #include #include #include +#ifdef MODEST_PLATFORM_MAEMO +#include +#endif static OssoABookContactModel *contact_model = NULL; static EBook *book = NULL; @@ -149,6 +152,7 @@ modest_address_book_select_addresses (ModestRecptEditor *recpt_editor, _AB("addr_ti_dia_select_contacts"), OSSO_ABOOK_CAPS_EMAIL, OSSO_ABOOK_CONTACT_ORDER_NAME); + /* Enable multiselection */ osso_abook_contact_chooser_set_maximum_selection (OSSO_ABOOK_CONTACT_CHOOSER (contact_chooser), G_MAXUINT); @@ -944,7 +948,7 @@ set_contact_from_display_name (EContact *contact, const gchar *disp_name) } static GList * -select_contacts_for_name_dialog (const gchar *name) +select_contacts_for_name_dialog (const gchar *name, GList *external_contacts) { EBookQuery *book_query = NULL; EBookView *book_view = NULL; @@ -981,6 +985,38 @@ select_contacts_for_name_dialog (const gchar *name) _AB("addr_ti_dia_select_contacts"), OSSO_ABOOK_CAPS_ALL, OSSO_ABOOK_CONTACT_ORDER_NAME); + +#ifdef MODEST_PLATFORM_MAEMO + if (external_contacts) { + + GList *row_list = NULL; + while (external_contacts) { + + AsDbusRecipient *recipient = (AsDbusRecipient*)external_contacts->data; + external_contacts = g_list_next (external_contacts); + if (!recipient) + continue; + + char *uid = osso_abook_create_temporary_uid (); + OssoABookContact *contact = osso_abook_contact_new (); + osso_abook_contact_set_uid (contact, uid); + e_contact_set (E_CONTACT (contact), E_CONTACT_FULL_NAME, recipient->display_name); + osso_abook_contact_set_value (E_CONTACT (contact), EVC_EMAIL, recipient->email_address); + + OssoABookListStoreRow *row = osso_abook_list_store_row_new (contact); + row_list = g_list_prepend (row_list, row); + /* FIXME: unref row? */ + + g_free (uid); + } + + if (row_list) { + osso_abook_list_store_merge_rows (OSSO_ABOOK_LIST_STORE (contact_model), row_list); + g_list_free (row_list); + } + } +#endif + /* Enable multiselection */ osso_abook_contact_chooser_set_maximum_selection (OSSO_ABOOK_CONTACT_CHOOSER (contact_dialog), G_MAXUINT); @@ -1057,7 +1093,7 @@ resolve_address (const gchar *address, gboolean *canceled) { GList *resolved_contacts; - CheckNamesInfo *info;; + CheckNamesInfo *info; OssoABookRoster *roster; g_return_val_if_fail (canceled, FALSE); @@ -1084,22 +1120,118 @@ resolve_address (const gchar *address, osso_abook_aggregator_find_contacts_full ((OssoABookAggregator *) roster, contact_name_or_email_starts_with, (gpointer) address); +#ifdef MODEST_PLATFORM_MAEMO + GList *external_contacts = asdbus_resolve_recipients (address); +#else + GList *external_contacts = NULL; +#endif hide_check_names_banner (info); - if (resolved_contacts == NULL) { + if (resolved_contacts == NULL && NULL == external_contacts) { /* no matching contacts for the search string */ modest_platform_run_information_dialog (NULL, _("mcen_nc_no_matching_contacts"), FALSE); clean_check_names_banner (info); return FALSE; } - if (g_list_length (resolved_contacts) > 1) { +#ifdef MODEST_PLATFORM_MAEMO + /* check for duplicate emails and remove from external_contacts if any */ + if (resolved_contacts && external_contacts) { + + GList *node, *ex_node; + + for (ex_node = external_contacts; ex_node != NULL; ex_node = g_list_next (ex_node)) { + + AsDbusRecipient *recipient = (AsDbusRecipient*)ex_node->data; + if (!recipient) + continue; + + for (node = resolved_contacts; node != NULL; node = g_list_next (node)) { + + EContact *contact = (EContact*)node->data; + GList *emails = e_contact_get (contact, E_CONTACT_EMAIL); + if (!emails) + continue; + + if (g_list_find_custom (emails, recipient->email_address, (GCompareFunc) compare_addresses)) { + + g_free (recipient->display_name); + g_free (recipient->email_address); + g_free (recipient); + recipient = NULL; + ex_node->data = NULL; + } + + g_list_foreach (emails, (GFunc) g_free, NULL); + g_list_free (emails); + + if (!recipient) + break; + } + } + } +#endif + + if (g_list_length (resolved_contacts) + g_list_length (external_contacts) > 1) { /* show a dialog to select the contact from the resolved ones */ g_list_free (resolved_contacts); - resolved_contacts = select_contacts_for_name_dialog (address); + resolved_contacts = select_contacts_for_name_dialog (address, external_contacts); + +#ifdef MODEST_PLATFORM_MAEMO + if (external_contacts) { + + GList *node; + for (node = external_contacts; node != NULL; node = g_list_next (node)) { + + AsDbusRecipient *recipient = (AsDbusRecipient*)node->data; + if (!recipient) + continue; + + g_free (recipient->display_name); + g_free (recipient->email_address); + g_free (recipient); + } + + g_list_free (external_contacts); + external_contacts = NULL; + } +#endif } +#ifdef MODEST_PLATFORM_MAEMO + if (external_contacts) { + + gboolean found = FALSE; + GList *node; + for (node = external_contacts; node != NULL; node = g_list_next (node)) { + + AsDbusRecipient *recipient = (AsDbusRecipient*)node->data; + if (!recipient) + continue; + + GString *formatted_recipient = g_string_new (NULL); + g_string_printf (formatted_recipient, "\"%s\" <%s>", recipient->display_name, recipient->email_address); + + /* FIXME: why we have to have list of lists? */ + GSList *formattedlist = g_slist_append(NULL, formatted_recipient->str); + *resolved_addresses = g_slist_append (*resolved_addresses, formattedlist); + /* FIXME: how important is an UID? */ + *contact_ids = g_slist_append (*contact_ids, g_strdup ("temp-uid")); + found = TRUE; + + g_string_free (formatted_recipient, FALSE); /* character data segment is NOT freed */ + g_free (recipient->display_name); + g_free (recipient->email_address); + g_free (recipient); + } + + g_list_free (external_contacts); + external_contacts = NULL; + return found; + } +#endif + /* get the resolved contacts (can be no contact) */ if (resolved_contacts) { GList *node; -- 1.7.9.5