Do not automatically add new contacts to addressbook when sending messages

Fixes NB#144914 (1/8)

diff --git a/src/hildon2/modest-msg-edit-window.c b/src/hildon2/modest-msg-edit-window.c
index 4074def..7a5d0f5 100644 (file)
--- a/src/hildon2/modest-msg-edit-window.c
+++ b/src/hildon2/modest-msg-edit-window.c
@@ -3403,24 +3403,27 @@ modest_msg_edit_window_check_names (ModestMsgEditWindow *window, gboolean add_to
 
        /* Check names */
        g_object_ref (window);
 
        /* Check names */
        g_object_ref (window);

-       if (!modest_address_book_check_names (MODEST_RECPT_EDITOR (priv->to_field),  &address_list)) {
+       if (!modest_address_book_check_names (MODEST_RECPT_EDITOR (priv->to_field),
+                                             (add_to_addressbook) ? &address_list : NULL)) {

                modest_recpt_editor_grab_focus (MODEST_RECPT_EDITOR (priv->to_field));
                g_object_unref (window);
                return FALSE;
        }
                modest_recpt_editor_grab_focus (MODEST_RECPT_EDITOR (priv->to_field));
                g_object_unref (window);
                return FALSE;
        }

-       if (!modest_address_book_check_names (MODEST_RECPT_EDITOR (priv->cc_field),  &address_list)) {
+       if (!modest_address_book_check_names (MODEST_RECPT_EDITOR (priv->cc_field),
+                                             (add_to_addressbook) ? &address_list : NULL)) {

                modest_recpt_editor_grab_focus (MODEST_RECPT_EDITOR (priv->cc_field));
                g_object_unref (window);
                return FALSE;
        }
                modest_recpt_editor_grab_focus (MODEST_RECPT_EDITOR (priv->cc_field));
                g_object_unref (window);
                return FALSE;
        }

-       if (!modest_address_book_check_names (MODEST_RECPT_EDITOR (priv->bcc_field), &address_list)) {
+       if (!modest_address_book_check_names (MODEST_RECPT_EDITOR (priv->bcc_field),
+                                             (add_to_addressbook) ? &address_list : NULL)) {

                modest_recpt_editor_grab_focus (MODEST_RECPT_EDITOR (priv->bcc_field));
                g_object_unref (window);
                return FALSE;
        }
 
        /* Add contacts to address book */
                modest_recpt_editor_grab_focus (MODEST_RECPT_EDITOR (priv->bcc_field));
                g_object_unref (window);
                return FALSE;
        }
 
        /* Add contacts to address book */

-       if (address_list)
+       if (add_to_addressbook && address_list)

                modest_address_book_add_address_list (address_list);
 
        if (!modest_recpt_editor_has_focus (MODEST_RECPT_EDITOR (priv->cc_field)) &&
                modest_address_book_add_address_list (address_list);
 
        if (!modest_recpt_editor_has_focus (MODEST_RECPT_EDITOR (priv->cc_field)) &&

diff --git a/src/modest-ui-actions.c b/src/modest-ui-actions.c
index 7d26705..6c8fdde 100644 (file)
--- a/src/modest-ui-actions.c
+++ b/src/modest-ui-actions.c
@@ -3160,7 +3160,8 @@ modest_ui_actions_on_send (GtkWidget *widget, ModestMsgEditWindow *edit_window)
 
        g_return_val_if_fail (MODEST_IS_MSG_EDIT_WINDOW(edit_window), TRUE);
 
 
        g_return_val_if_fail (MODEST_IS_MSG_EDIT_WINDOW(edit_window), TRUE);
 

-       if (!modest_msg_edit_window_check_names (edit_window, TRUE))
+       /* Check names but do not automatically add them to addressbook */
+       if (!modest_msg_edit_window_check_names (edit_window, FALSE))

                return TRUE;
 
        data = modest_msg_edit_window_get_msg_data (edit_window);
                return TRUE;
 
        data = modest_msg_edit_window_get_msg_data (edit_window);