X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fmaemo%2Fmodest-address-book.c;h=faa1fb1586fdfa29f1a6162d356177ead7137767;hb=e468d62e86da9f16820ac0cc8d7d1f106bf080bf;hp=e7c2dc91df75d034a04a18012791beb26871eece;hpb=3683156120f585a9280a87e8cdf4a6f38942141b;p=modest

diff --git a/src/maemo/modest-address-book.c b/src/maemo/modest-address-book.c
index e7c2dc9..faa1fb1 100644
--- a/src/maemo/modest-address-book.c
+++ b/src/maemo/modest-address-book.c
@@ -82,8 +82,13 @@ get_book_view_cb (EBook *book, EBookStatus status, EBookView *bookview, gpointer
 	book_view = bookview;
 
 	if (contact_model)
+#if MODEST_ABOOK_API < 4
 		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);
 }
@@ -166,15 +171,22 @@ modest_address_book_add_address (const gchar *address)
 void
 modest_address_book_select_addresses (ModestRecptEditor *recpt_editor)
 {
+#if MODEST_ABOOK_API < 4
 	GtkWidget *contact_view = NULL;
-	GList *contacts_list = NULL;
 	GtkWidget *contact_dialog;
+	GtkWidget *toplevel;
+#else /* MODEST_ABOOK_API < 4 */
+	OssoABookContactChooser *contact_chooser = NULL;
+#endif /* MODEST_ABOOK_API < 4 */
+
+	GList *contacts_list = NULL;
 	GSList *email_addrs_per_contact = NULL;
 	gchar *econtact_id;
 	gboolean focus_recpt_editor = FALSE;
 
 	g_return_if_fail (MODEST_IS_RECPT_EDITOR (recpt_editor));
 
+#if MODEST_ABOOK_API < 4
 	if (!open_addressbook ()) {
 		if (contact_model) {
 			g_object_unref (contact_model);
@@ -189,7 +201,8 @@ modest_address_book_select_addresses (ModestRecptEditor *recpt_editor)
 
 	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), (GtkWindow *) toplevel);
 
 	gtk_widget_show (contact_dialog);
 
@@ -198,6 +211,18 @@ modest_address_book_select_addresses (ModestRecptEditor *recpt_editor)
 			osso_abook_contact_selector_get_extended_selection (OSSO_ABOOK_CONTACT_SELECTOR
 									     (contact_view));
 	}
+#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);
+#endif
 	
 	if (contacts_list) {
 		GList *node;
@@ -219,12 +244,14 @@ modest_address_book_select_addresses (ModestRecptEditor *recpt_editor)
 		g_list_free (contacts_list);
 	}
 
+#if MODEST_ABOOK_API < 4
 	if (contact_model) {
 		g_object_unref (contact_model);
 		contact_model = NULL;
 	}
 
 	gtk_widget_destroy (contact_dialog);
+#endif
 
 	if (focus_recpt_editor)
 		modest_recpt_editor_grab_focus (MODEST_RECPT_EDITOR (recpt_editor));
@@ -282,9 +309,17 @@ static GSList *get_recipients_for_given_contact(EContact * contact)
 
 	/*Launch the 'Add e-mail addr to contact' dialog if required */
 	if (email_not_present) {
-		display_name = osso_abook_contact_get_display_name(contact);
-		emailid = get_email_addr_from_user(display_name);
+#if MODEST_ABOOK_API < 4
+		display_name = osso_abook_contact_get_display_name(contact);		
+#else
+		OssoABookContact *abook_contact;
+	       
+		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);
 		if (emailid) {
 			e_contact_set(contact, E_CONTACT_EMAIL_1, emailid);
 			commit_contact(contact, FALSE);
@@ -341,11 +376,11 @@ commit_contact(EContact * contact, gboolean is_new)
 	if (!contact || !book)
 		return;
 	
-#ifdef MODEST_HAVE_OLD_ABOOK	
+#if MODEST_ABOOK_API < 2
 	osso_abook_contact_commit(contact, is_new, book);
 #else
 	osso_abook_contact_commit(contact, is_new, book, NULL);
-#endif /* MODEST_HILDON_VERSION_0 */
+#endif /* MODEST_ABOOK_API < 2 */
 }
 
 /**
@@ -473,7 +508,7 @@ run_add_email_addr_to_contact_dlg(const gchar * contact_name)
 				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 );
@@ -653,6 +688,18 @@ show_check_names_banner (gpointer userdata)
 	return FALSE;
 }
 
+static void
+hide_check_names_banner (GtkWidget **banner, guint banner_timeout)
+{
+	if (*banner != NULL) {
+		gtk_widget_destroy (*banner);
+		*banner = NULL;
+	} else {
+		g_source_remove (banner_timeout);
+	}
+
+}
+
 gboolean
 modest_address_book_check_names (ModestRecptEditor *recpt_editor, gboolean update_addressbook)
 {
@@ -664,8 +711,6 @@ modest_address_book_check_names (ModestRecptEditor *recpt_editor, gboolean updat
 	gint offset_delta = 0;
 	gint last_length;
 	GtkTextIter start_iter, end_iter;
-	guint banner_timeout;
-	GtkWidget *banner = NULL;
 
 	g_return_val_if_fail (MODEST_IS_RECPT_EDITOR (recpt_editor), FALSE);
 
@@ -682,8 +727,6 @@ modest_address_book_check_names (ModestRecptEditor *recpt_editor, gboolean updat
 		}
 	}
 
-	banner_timeout = g_timeout_add (500, show_check_names_banner, &banner);
-
 	current_start = start_indexes;
 	current_end = end_indexes;
 	buffer = modest_recpt_editor_get_buffer (recpt_editor);
@@ -710,16 +753,17 @@ modest_address_book_check_names (ModestRecptEditor *recpt_editor, gboolean updat
 			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"), 
+					_CS("ckdg_ib_illegal_characters_entered"), 
 					char_in_string);
 				g_free (char_in_string);
 				hildon_banner_show_information (NULL, NULL, message );
-				g_free (message);				
+				g_free (message);
 				result = FALSE;
 			} else if (strstr (address, "@") == NULL) {
 				/* here goes searching in addressbook */
 				gchar *contact_id = NULL;
 				GSList *resolved_addresses = NULL;
+
 				result = resolve_address (address, &resolved_addresses, &contact_id);
 
 				if (result) {
@@ -794,14 +838,6 @@ modest_address_book_check_names (ModestRecptEditor *recpt_editor, gboolean updat
 	g_slist_free (start_indexes);
 	g_slist_free (end_indexes);
 
-	g_source_remove (banner_timeout);
-	if (banner != NULL) {
-		gtk_widget_destroy (banner);
-		banner = NULL;
-	} else {
-		g_source_remove (banner_timeout);
-	}
-
 	return result;
 
 }
@@ -843,11 +879,16 @@ select_contacts_for_name_dialog (const gchar *name)
 	if (book_view) {
 		GtkWidget *contact_view = NULL;
 		GtkWidget *contact_dialog = NULL;
+#if MODEST_ABOOK_API < 4
 		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_view_new_basic (contact_model);
+		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));
@@ -864,6 +905,10 @@ static gboolean
 resolve_address (const gchar *address, GSList **resolved_addresses, gchar **contact_id)
 {
 	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 ();
 	if (!open_addressbook_sync ()) {
@@ -879,6 +924,8 @@ resolve_address (const gchar *address, GSList **resolved_addresses, gchar **cont
 	if (resolved_contacts == NULL) {
 		/* no matching contacts for the search string */
 		modest_platform_run_information_dialog (NULL, _("mcen_nc_no_matching_contacts"), FALSE);
+		hide_check_names_banner (&banner, banner_timeout);
+     
 		return FALSE;
 	}
 
@@ -886,7 +933,10 @@ resolve_address (const gchar *address, GSList **resolved_addresses, gchar **cont
 		/* show a dialog to select the contact from the resolved ones */
 		g_list_free (resolved_contacts);
 
+		hide_check_names_banner (&banner, banner_timeout);     
 		resolved_contacts = select_contacts_for_name_dialog (address);
+		banner_timeout = g_timeout_add (500, show_check_names_banner, &banner);
+
 	}
 	
 	/* get the resolved contacts (can be no contact) */
@@ -895,6 +945,7 @@ resolve_address (const gchar *address, GSList **resolved_addresses, gchar **cont
 		EContact *contact = (EContact *) resolved_contacts->data;
 
 		*resolved_addresses = get_recipients_for_given_contact (contact);
+		hide_check_names_banner (&banner, banner_timeout);     
 		if (*resolved_addresses) {
 			*contact_id = g_strdup (e_contact_get_const (contact, E_CONTACT_UID));
 			found = TRUE;
@@ -909,6 +960,7 @@ resolve_address (const gchar *address, GSList **resolved_addresses, gchar **cont
 	} else {
 		/* cancelled dialog to select more than one contact or
 		 * selected no contact */
+		hide_check_names_banner (&banner, banner_timeout);     
 		return FALSE;
 	}
 
@@ -944,3 +996,45 @@ unquote_string (const gchar *str)
 	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;
+}