From: Jose Dapena Paz <jdapena@igalia.com>
Date: Sun, 31 May 2009 19:17:56 +0000 (+0200)
Subject: Check if subject or recipients are empty on trying to send with shortcut
X-Git-Tag: 3.0.17-rc10~32
X-Git-Url: http://git.maemo.org/git/?p=modest;a=commitdiff_plain;h=85b45045c6b46f9a8e3f2e4b5d5500be17892e42

Check if subject or recipients are empty on trying to send with shortcut
(fixes NB#118464).
---

diff --git a/src/modest-ui-actions.c b/src/modest-ui-actions.c
index 0e02dde..bbb44a7 100644
--- a/src/modest-ui-actions.c
+++ b/src/modest-ui-actions.c
@@ -3130,6 +3130,7 @@ modest_ui_actions_on_send (GtkWidget *widget, ModestMsgEditWindow *edit_window)
 	ModestAccountMgr *account_mgr;
 	gchar *account_name;
 	ModestMailOperation *mail_operation;
+	gchar *recipients;
 
 	g_return_val_if_fail (MODEST_IS_MSG_EDIT_WINDOW(edit_window), TRUE);
 
@@ -3138,6 +3139,24 @@ modest_ui_actions_on_send (GtkWidget *widget, ModestMsgEditWindow *edit_window)
 
 	data = modest_msg_edit_window_get_msg_data (edit_window);
 
+	if (data->subject == NULL || data->subject[0] == '\0') {
+		/* Empty subject -> no send */
+		modest_msg_edit_window_free_msg_data (edit_window, data);
+		return FALSE;
+	}
+
+	recipients = g_strconcat (data->to?data->to:"", 
+				  data->cc?data->cc:"",
+				  data->bcc?data->bcc:"",
+				  NULL);
+	if (recipients == NULL || recipients[0] == '\0') {
+		/* Empty subject -> no send */
+		g_free (recipients);
+		modest_msg_edit_window_free_msg_data (edit_window, data);
+		return FALSE;
+	}
+	g_free (recipients);
+
 	/* Check size */
 	if (!enough_space_for_message (edit_window, data)) {
 		modest_msg_edit_window_free_msg_data (edit_window, data);