From 5beb8dca7c670db2949b165153d92337736efed2 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Sergio=20Villar=20Sen=C3=ADn?= Date: Fri, 4 Dec 2009 11:38:08 +0100 Subject: [PATCH] Revert "Query activesync for addressbooks too (if available)." This reverts commit 86c4b693d6773178fab408d3c2f9dbfdc49562c8. It was causing crashes sometimes when resolving recipients Conflicts: src/hildon2/modest-address-book.c --- src/dbus_api/Makefile.am | 3 +- src/dbus_api/asdbus-bindings.h | 80 ------------------------ src/dbus_api/asdbus.c | 119 ----------------------------------- src/dbus_api/asdbus.h | 45 -------------- src/hildon2/modest-address-book.c | 124 ++----------------------------------- 5 files changed, 6 insertions(+), 365 deletions(-) delete mode 100644 src/dbus_api/asdbus-bindings.h delete mode 100644 src/dbus_api/asdbus.c delete mode 100644 src/dbus_api/asdbus.h diff --git a/src/dbus_api/Makefile.am b/src/dbus_api/Makefile.am index f5e89b7..be23501 100644 --- a/src/dbus_api/Makefile.am +++ b/src/dbus_api/Makefile.am @@ -49,8 +49,7 @@ noinst_LTLIBRARIES=\ libmodest_dbus_api_la_SOURCES= \ modest-dbus-callbacks.h modest-dbus-callbacks.c \ - modest-dbus-api.h \ - asdbus.h asdbus.c asdbus-bindings.h + modest-dbus-api.h LDADD = \ $(LIBMODEST_DBUS_CLIENT_LIBS) diff --git a/src/dbus_api/asdbus-bindings.h b/src/dbus_api/asdbus-bindings.h deleted file mode 100644 index 64f9aaf..0000000 --- a/src/dbus_api/asdbus-bindings.h +++ /dev/null @@ -1,80 +0,0 @@ -/* 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 deleted file mode 100644 index d21eb11..0000000 --- a/src/dbus_api/asdbus.c +++ /dev/null @@ -1,119 +0,0 @@ -/* Copyright (c) 2006, 2008 Nokia Corporation - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are - * met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * * Neither the name of the Nokia Corporation nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS - * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED - * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A - * PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER - * OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING - * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -#include "asdbus.h" -#include "asdbus-bindings.h" -#include -#include "modest-runtime.h" -#include "modest-protocol.h" -#include "modest-protocol-registry.h" -#include "modest-account-mgr.h" - - -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); -} - - -/* assuming g_type_init is already called */ -GList * asdbus_resolve_recipients (const gchar *name) -{ - GList *result = NULL; - DBusGConnection *bus = NULL; - GError *error = NULL; - DBusGProxy *asdbus = NULL; - GValueArray* reply = NULL; - ModestProtocol *protocol = NULL; - ModestProtocolType protocol_type; - - protocol = modest_protocol_registry_get_protocol_by_name ( - modest_runtime_get_protocol_registry (), - MODEST_PROTOCOL_REGISTRY_STORE_PROTOCOLS, // MODEST_PROTOCOL_REGISTRY_TRANSPORT_PROTOCOLS ? - "activesync"); - protocol_type = modest_protocol_get_type_id (protocol); - if (!modest_account_mgr_singleton_protocol_exists(modest_runtime_get_account_mgr(), protocol_type)) { - return NULL; - } - - 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 deleted file mode 100644 index 4de34b2..0000000 --- a/src/dbus_api/asdbus.h +++ /dev/null @@ -1,45 +0,0 @@ -/* Copyright (c) 2006, Nokia Corporation - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are - * met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * * Neither the name of the Nokia Corporation nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS - * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED - * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A - * PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER - * OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING - * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - - -#ifndef __MODEST_ASDBUS_H__ -#define __MODEST_ASDBUS_H__ - - -#include - -typedef struct { - gchar *display_name; - gchar *email_address; -} AsDbusRecipient; - -GList * asdbus_resolve_recipients (const gchar *name); - - -#endif /* __MODEST_ASDBUS_H__ */ diff --git a/src/hildon2/modest-address-book.c b/src/hildon2/modest-address-book.c index 1c2c740..5cbc826 100644 --- a/src/hildon2/modest-address-book.c +++ b/src/hildon2/modest-address-book.c @@ -51,7 +51,6 @@ #include #include #include -#include static OssoABookContactModel *contact_model = NULL; static EBook *book = NULL; @@ -999,7 +998,7 @@ set_contact_from_display_name (EContact *contact, const gchar *disp_name) } static GList * -select_contacts_for_name_dialog (const gchar *name, GList *external_contacts) +select_contacts_for_name_dialog (const gchar *name) { EBookQuery *book_query = NULL; EBookView *book_view = NULL; @@ -1033,36 +1032,6 @@ select_contacts_for_name_dialog (const gchar *name, GList *external_contacts) _AB("addr_ti_dia_select_contacts"), OSSO_ABOOK_CAPS_EMAIL, OSSO_ABOOK_CONTACT_ORDER_NAME); - - 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); - set_contact_from_display_name (E_CONTACT (contact), 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); - } - } - /* Enable multiselection */ osso_abook_contact_chooser_set_maximum_selection (OSSO_ABOOK_CONTACT_CHOOSER (contact_dialog), G_MAXUINT); @@ -1087,7 +1056,7 @@ resolve_address (const gchar *address, gboolean *canceled) { GList *resolved_contacts; - CheckNamesInfo *info; + CheckNamesInfo *info;; g_return_val_if_fail (canceled, FALSE); @@ -1109,103 +1078,20 @@ resolve_address (const gchar *address, } resolved_contacts = get_contacts_for_name (address); - GList *external_contacts = asdbus_resolve_recipients (address); hide_check_names_banner (info); - if (NULL == resolved_contacts && NULL == external_contacts) { + if (resolved_contacts == NULL) { /* 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; } - /* 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 (g_list_length (resolved_contacts) + g_list_length (external_contacts) > 1) { + if (g_list_length (resolved_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, external_contacts); - - 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; - } - } - - 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; + resolved_contacts = select_contacts_for_name_dialog (address); } /* get the resolved contacts (can be no contact) */ -- 1.7.9.5