#include <modest-text-utils.h>
#include <libebook/e-book.h>
#include <libebook/e-book-view.h>
-#include <libosso-abook/osso-abook.h>
+#include <libebook/e-vcard.h>
#include "modest-hildon-includes.h"
+#include <libosso-abook/osso-abook.h>
#include "modest-platform.h"
#include "modest-runtime.h"
#include "widgets/modest-window-mgr.h"
+#include "widgets/modest-ui-constants.h"
#include <string.h>
#include <gtk/gtksizegroup.h>
#include <gtk/gtkbox.h>
if (!book)
return FALSE;
- e_book_async_open (book, FALSE, book_open_cb, NULL);
+ if (e_book_async_open (book, FALSE, book_open_cb, NULL) != E_BOOK_ERROR_OK)
+ return FALSE;
return TRUE; /* FIXME */
}
if (!book)
return FALSE;
- e_book_open (book, FALSE, NULL);
-
- return TRUE;
+ return e_book_open (book, FALSE, NULL);
}
void
modest_address_book_add_address (const gchar *address)
{
- OssoABookAccount *account = NULL;
GtkWidget *dialog = NULL;
- gchar *email_address = NULL;
+ gchar *email_address;
+ EVCardAttribute *attribute;
- contact_model = osso_abook_contact_model_new ();
if (!open_addressbook ()) {
- if (contact_model) {
- g_object_unref (contact_model);
- contact_model = NULL;
- }
return;
}
email_address = modest_text_utils_get_email_address (address);
- account = osso_abook_account_get (EVC_EMAIL, NULL, email_address);
- g_free (email_address);
- if (account)
- {
- dialog = osso_abook_add_to_contacts_dialog_new (contact_model, account);
- g_object_unref (account);
- gtk_dialog_run (GTK_DIALOG (dialog));
+ attribute = e_vcard_attribute_new (NULL, EVC_EMAIL);
+ e_vcard_attribute_add_value (attribute, email_address);
+ dialog = osso_abook_temporary_contact_dialog_new (NULL, book, attribute, NULL);
+ gtk_dialog_run (GTK_DIALOG (dialog));
- if (contact_model) {
- g_object_unref (contact_model);
- contact_model = NULL;
- }
+ gtk_widget_destroy (dialog);
- gtk_widget_destroy (dialog);
- }
+ e_vcard_attribute_free (attribute);
+ g_free (email_address);
}
#if MODEST_ABOOK_API < 4
GtkWidget *contact_view = NULL;
GtkWidget *contact_dialog;
+ GtkWidget *toplevel;
#else /* MODEST_ABOOK_API < 4 */
- OssoABookContactChooser *contact_chooser = NULL;
+ GtkWidget *contact_chooser = NULL;
#endif /* MODEST_ABOOK_API < 4 */
GList *contacts_list = NULL;
osso_abook_contact_selector_set_minimum_selection (OSSO_ABOOK_CONTACT_SELECTOR (contact_view), 1);
contact_dialog = osso_abook_select_dialog_new (OSSO_ABOOK_TREE_VIEW (contact_view));
- gtk_window_set_title (GTK_WINDOW (contact_dialog), _("mcen_ti_select_recipients"));
- modest_window_mgr_set_modal (modest_runtime_get_window_mgr (), GTK_WINDOW (contact_dialog));
+ toplevel = gtk_widget_get_toplevel (GTK_WIDGET (recpt_editor));
+ modest_window_mgr_set_modal (modest_runtime_get_window_mgr (), GTK_WINDOW (contact_dialog), GTK_WINDOW (toplevel));
gtk_widget_show (contact_dialog);
}
#else /* MODEST_ABOOK_API < 4 */
/* TODO: figure out how to make the contact chooser modal */
- contact_chooser = osso_abook_contact_chooser_new
- ("title", _("mcen_ti_select_recipients"),
- "help-topic", "",
- "minimum-selection", 1, NULL);
-
- if (osso_abook_contact_chooser_run (contact_chooser) == GTK_RESPONSE_OK)
- contacts_list = osso_abook_contact_chooser_get_selection (contact_chooser);
-
- g_object_unref (contact_chooser);
+ contact_chooser = osso_abook_contact_chooser_new_with_capabilities (NULL,
+ _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);
+
+ if (gtk_dialog_run (GTK_DIALOG (contact_chooser)) == GTK_RESPONSE_OK)
+ contacts_list = osso_abook_contact_chooser_get_selection (OSSO_ABOOK_CONTACT_CHOOSER (contact_chooser));
+ gtk_widget_destroy (contact_chooser);
#endif
-
+
if (contacts_list) {
GList *node;
abook_contact = osso_abook_contact_new_from_template (contact);
display_name = osso_abook_contact_get_display_name(abook_contact);
- g_object_unref (abook_contact);
#endif
emailid = get_email_addr_from_user(display_name);
e_contact_set(contact, E_CONTACT_EMAIL_1, emailid);
commit_contact(contact, FALSE);
}
+#if MODEST_ABOOK_API >= 4
+ g_object_unref (abook_contact);
+#endif
}
if (emailid) {
{
g_return_if_fail (contact);
g_return_if_fail (book);
-
+
if (!contact || !book)
return;
-
-#if MODEST_ABOOK_API < 2
+
+#if MODEST_ABOOK_API < 4
osso_abook_contact_commit(contact, is_new, book);
#else
- osso_abook_contact_commit(contact, is_new, book, NULL);
+ if (OSSO_ABOOK_IS_CONTACT (contact)) {
+ osso_abook_contact_commit(OSSO_ABOOK_CONTACT(contact), is_new, book, NULL);
+ } else {
+ if (is_new)
+ e_book_add_contact (book, contact, NULL);
+ else
+ e_book_commit_contact (book, contact, NULL);
+ }
#endif /* MODEST_ABOOK_API < 2 */
}
add_email_addr_to_contact_dlg =
gtk_dialog_new_with_buttons(_("mcen_ti_add_email_title"), NULL,
GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
- _("mcen_bd_dialog_ok"), GTK_RESPONSE_ACCEPT,
- _("mcen_bd_dialog_cancel"), GTK_RESPONSE_REJECT, NULL);
+ _HL("wdgt_bd_done"), GTK_RESPONSE_ACCEPT, NULL);
gtk_dialog_set_has_separator(GTK_DIALOG(add_email_addr_to_contact_dlg), FALSE);
/*Set app_name & state_save related tags to the window */
if ((invalid_char_offset != NULL)&&(*invalid_char_offset != '\0')) {
gchar *char_in_string = g_strdup_printf ("%c", *invalid_char_offset);
gchar *message = g_strdup_printf(
- dgettext("hildon-common-strings", "ckdg_ib_illegal_characters_entered"),
+ _CS("ckdg_ib_illegal_characters_entered"),
char_in_string);
hildon_banner_show_information (
add_email_addr_to_contact_dlg, NULL, message );
gtk_dialog_new_with_buttons(_("mcen_ti_select_email_title"),
NULL,
GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
- _("mcen_bd_dialog_ok"), GTK_RESPONSE_ACCEPT,
- _("mcen_bd_dialog_cancel"), GTK_RESPONSE_REJECT, NULL);
+ _HL("wdgt_bd_done"), GTK_RESPONSE_ACCEPT, NULL);
gtk_dialog_set_has_separator(GTK_DIALOG(select_email_addr_dlg), FALSE);
/* Make the window approximately big enough, because it doesn't resize to be big enough
* for the window title text: */
- gtk_window_set_default_size (GTK_WINDOW (select_email_addr_dlg), 400, -1);
+ gtk_window_set_default_size (GTK_WINDOW (select_email_addr_dlg), MODEST_DIALOG_WINDOW_MAX_HEIGHT, -1);
scrolledwindow = gtk_scrolled_window_new(NULL, NULL);
gtk_box_pack_start(GTK_BOX(GTK_DIALOG(select_email_addr_dlg)->vbox), scrolledwindow, TRUE,
g_return_val_if_fail (address, FALSE);
- if (!book)
- open_addressbook ();
+ if (!book) {
+ if (!open_addressbook ()) {
+ g_return_val_if_reached (FALSE);
+ }
+ }
g_return_val_if_fail (book, FALSE);
GtkWidget **banner = (GtkWidget **) userdata;
gdk_threads_enter ();
- *banner = modest_platform_animation_banner (NULL, NULL, _("mail_ib_checking_names"));
+ *banner = hildon_banner_show_animation (NULL, NULL, _("mail_ib_checking_names"));
gdk_threads_leave ();
return FALSE;
if (!modest_text_utils_validate_recipient (address, &invalid_char_position)) {
if ((invalid_char_position != NULL) && (*invalid_char_position != '\0')) {
gchar *char_in_string = g_strdup_printf("%c", *invalid_char_position);
- gchar *message = g_strdup_printf(
- dgettext("hildon-common-strings", "ckdg_ib_illegal_characters_entered"),
- char_in_string);
+ gchar *message =
+ g_strdup_printf(_CS("ckdg_ib_illegal_characters_entered"),
+ char_in_string);
g_free (char_in_string);
hildon_banner_show_information (NULL, NULL, message );
g_free (message);
e_book_query_unref (full_name_book_query);
if (book_view) {
- GtkWidget *contact_view = NULL;
GtkWidget *contact_dialog = NULL;
#if MODEST_ABOOK_API < 4
+ GtkWidget *contact_view = NULL;
osso_abook_tree_model_set_book_view (OSSO_ABOOK_TREE_MODEL (contact_model), book_view);
-#else /* MODEST_ABOOK_API < 4 */
- osso_abook_list_store_set_book_view (OSSO_ABOOK_LIST_STORE (contact_model), book_view);
-#endif /* MODEST_ABOOK_API < 4 */
e_book_view_start (book_view);
-
+
contact_view = osso_abook_contact_selector_new_basic (contact_model);
contact_dialog = osso_abook_select_dialog_new (OSSO_ABOOK_TREE_VIEW (contact_view));
- gtk_window_set_title (GTK_WINDOW (contact_dialog), _("mcen_ti_select_recipients"));
if (gtk_dialog_run (GTK_DIALOG (contact_dialog)) == GTK_RESPONSE_OK) {
result = osso_abook_contact_view_get_selection (OSSO_ABOOK_CONTACT_VIEW (contact_view));
e_book_view_stop (book_view);
g_object_unref (book_view);
gtk_widget_destroy (contact_dialog);
+#else /* MODEST_ABOOK_API < 4 */
+ osso_abook_list_store_set_book_view (OSSO_ABOOK_LIST_STORE (contact_model), book_view);
+ e_book_view_start (book_view);
+
+ /* TODO: figure out how to make the contact chooser modal */
+ contact_dialog = osso_abook_contact_chooser_new_with_capabilities (NULL,
+ _AB("addr_ti_dia_select_contacts"),
+ OSSO_ABOOK_CAPS_EMAIL,
+ OSSO_ABOOK_CONTACT_ORDER_NAME);
+ osso_abook_contact_chooser_set_model (OSSO_ABOOK_CONTACT_CHOOSER (contact_dialog),
+ contact_model);
+
+ if (gtk_dialog_run (GTK_DIALOG (contact_dialog)) == GTK_RESPONSE_OK)
+ result = osso_abook_contact_chooser_get_selection (OSSO_ABOOK_CONTACT_CHOOSER (contact_dialog));
+ e_book_view_stop (book_view);
+ g_object_unref (book_view);
+ gtk_widget_destroy (contact_dialog);
+#endif /* MODEST_ABOOK_API < 4 */
}
return result;
GList *resolved_contacts;
guint banner_timeout;
GtkWidget *banner = NULL;
-
+
banner_timeout = g_timeout_add (500, show_check_names_banner, &banner);
contact_model = osso_abook_contact_model_new ();
return g_string_free (buffer, FALSE);
}
+
+gboolean
+modest_address_book_has_address (const gchar *address)
+{
+ EBookQuery *query;
+ GList *contacts = NULL;
+ GError *err = NULL;
+ gchar *email;
+ gboolean result;
+
+ g_return_val_if_fail (address, FALSE);
+
+ if (!book) {
+ if (!open_addressbook ()) {
+ g_return_val_if_reached (FALSE);
+ }
+ }
+
+ g_return_val_if_fail (book, FALSE);
+
+ email = modest_text_utils_get_email_address (address);
+
+ query = e_book_query_field_test (E_CONTACT_EMAIL, E_BOOK_QUERY_IS, email);
+ if (!e_book_get_contacts (book, query, &contacts, &err)) {
+ g_printerr ("modest: failed to get contacts: %s",
+ err ? err->message : "<unknown>");
+ if (err)
+ g_error_free (err);
+ return FALSE;
+ }
+ e_book_query_unref (query);
+
+ result = (contacts != NULL);
+ if (contacts) {
+ g_list_foreach (contacts, (GFunc)unref_gobject, NULL);
+ g_list_free (contacts);
+ }
+
+ g_free (email);
+
+ return result;
+}
projects / modest / blobdiff