X-Git-Url: http://vcs.maemo.org/git/?a=blobdiff_plain;f=src%2Fmodest-ui-actions.c;h=7ed4609c678299662309a9fdb1dcbb4112cdef17;hb=23c042a0b5053abc7c406f1e37e162f7a7771abe;hp=667224b8c321c1b1e028f0b0610365951ffa3760;hpb=f3d583d6a6f5066b7f9ea655ee3c16c67a85a343;p=modest

diff --git a/src/modest-ui-actions.c b/src/modest-ui-actions.c
index 667224b..7ed4609 100644
--- a/src/modest-ui-actions.c
+++ b/src/modest-ui-actions.c
@@ -686,9 +686,10 @@ modest_ui_actions_on_close_window (GtkAction *action, ModestWindow *win)
 void
 modest_ui_actions_add_to_contacts (GtkAction *action, ModestWindow *win)
 {
-       g_return_if_fail (MODEST_IS_MSG_VIEW_WINDOW (win));
-
-       modest_msg_view_window_add_to_contacts (MODEST_MSG_VIEW_WINDOW (win));
+	if (MODEST_IS_MSG_VIEW_WINDOW (win))
+		modest_msg_view_window_add_to_contacts (MODEST_MSG_VIEW_WINDOW (win));
+	else if (MODEST_IS_MSG_EDIT_WINDOW (win))
+		modest_msg_edit_window_add_to_contacts (MODEST_MSG_EDIT_WINDOW (win));
 }
 
 void
@@ -2188,8 +2189,8 @@ idle_refresh_folder (gpointer source)
 		header_view = modest_header_window_get_header_view ((ModestHeaderWindow *) source);
 #else
 	if (MODEST_IS_MAIN_WINDOW (source))
-		header_view = modest_main_window_get_child_widget ((ModestMainWindow *) source,
-								   MODEST_MAIN_WINDOW_WIDGET_TYPE_HEADER_VIEW);
+		header_view = MODEST_HEADER_VIEW (modest_main_window_get_child_widget (MODEST_MAIN_WINDOW (source),
+										       MODEST_MAIN_WINDOW_WIDGET_TYPE_HEADER_VIEW));
 #endif
 	if (header_view) {
 		TnyFolder *folder = modest_header_view_get_folder (header_view);
@@ -3160,7 +3161,8 @@ modest_ui_actions_on_send (GtkWidget *widget, ModestMsgEditWindow *edit_window)
 
 	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);