X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmaemo%2Fmodest-msg-edit-window.c;h=e3f16cc1585a246a58f831a9aeaf0ce5741c4d4c;hp=da30d633dcd7dcf97ddeb6b7d1234f3d8fadcfe0;hb=556398d85f1803ab8d4871a107bc4b8938c444ae;hpb=84c2681caafc791433135f704227111272e45203

diff --git a/src/maemo/modest-msg-edit-window.c b/src/maemo/modest-msg-edit-window.c
index da30d63..e3f16cc 100644
--- a/src/maemo/modest-msg-edit-window.c
+++ b/src/maemo/modest-msg-edit-window.c
@@ -241,7 +241,7 @@ static void
 save_settings (ModestMsgEditWindow *self)
 {
 	modest_widget_memory_save (modest_runtime_get_conf(),
-				   G_OBJECT(self), "modest-edit-msg-window");
+				   G_OBJECT(self), MODEST_CONF_EDIT_WINDOW_KEY);
 }
 
 
@@ -249,7 +249,7 @@ static void
 restore_settings (ModestMsgEditWindow *self)
 {
 	modest_widget_memory_restore (modest_runtime_get_conf(),
-				      G_OBJECT(self), "modest-edit-msg-window");
+				      G_OBJECT(self), MODEST_CONF_EDIT_WINDOW_KEY);
 }
 
 
@@ -262,7 +262,8 @@ get_transports (void)
 	GSList *cursor, *accounts;
 	
 	account_mgr = modest_runtime_get_account_mgr();
- 	cursor = accounts = modest_account_mgr_account_names (account_mgr); 
+ 	cursor = accounts = modest_account_mgr_account_names (account_mgr, 
+ 						TRUE /* only enabled accounts. */); 
 	while (cursor) {
 		gchar *account_name = (gchar*)cursor->data;
 		gchar *from_string  = modest_account_mgr_get_from_string (account_mgr,
@@ -2029,3 +2030,32 @@ is_modified (ModestMsgEditWindow *editor)
 	return FALSE;
 }
 
+gboolean
+modest_msg_edit_window_check_names (ModestMsgEditWindow *window)
+{
+	ModestMsgEditWindowPrivate *priv = NULL;
+
+	g_return_val_if_fail (MODEST_IS_MSG_EDIT_WINDOW (window), FALSE);
+	priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window);
+
+	/* check if there's no recipient added */
+	if ((gtk_text_buffer_get_char_count (modest_recpt_editor_get_buffer (MODEST_RECPT_EDITOR (priv->to_field))) == 0) &&
+	    (gtk_text_buffer_get_char_count (modest_recpt_editor_get_buffer (MODEST_RECPT_EDITOR (priv->cc_field))) == 0) &&
+	    (gtk_text_buffer_get_char_count (modest_recpt_editor_get_buffer (MODEST_RECPT_EDITOR (priv->bcc_field))) == 0)) {
+		/* no recipient contents, then select contacts */
+		modest_msg_edit_window_open_addressbook (window, NULL);
+		return FALSE;
+	}
+
+	if (!modest_address_book_check_names (MODEST_RECPT_EDITOR (priv->to_field)))
+		return FALSE;
+	if (!modest_address_book_check_names (MODEST_RECPT_EDITOR (priv->cc_field)))
+		return FALSE;
+	if (!modest_address_book_check_names (MODEST_RECPT_EDITOR (priv->bcc_field)))
+		return FALSE;
+
+	modest_recpt_editor_grab_focus (MODEST_RECPT_EDITOR (priv->to_field));
+
+	return TRUE;
+
+}