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

diff --git a/src/maemo/modest-address-book.c b/src/maemo/modest-address-book.c
index c7087ca..faa1fb1 100644
--- a/src/maemo/modest-address-book.c
+++ b/src/maemo/modest-address-book.c
@@ -174,6 +174,7 @@ modest_address_book_select_addresses (ModestRecptEditor *recpt_editor)
 #if MODEST_ABOOK_API < 4
 	GtkWidget *contact_view = NULL;
 	GtkWidget *contact_dialog;
+	GtkWidget *toplevel;
 #else /* MODEST_ABOOK_API < 4 */
 	OssoABookContactChooser *contact_chooser = NULL;
 #endif /* MODEST_ABOOK_API < 4 */
@@ -200,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);
 
@@ -307,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);
@@ -498,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 );
@@ -743,11 +753,11 @@ 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 */
@@ -876,8 +886,9 @@ select_contacts_for_name_dialog (const gchar *name)
 #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));
@@ -985,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;
+}