From: Sergio Villar Senin <svillar@igalia.com>
Date: Thu, 17 Sep 2009 10:55:38 +0000 (+0200)
Subject: Fixes NB#133759, do allow sending messages without subject
X-Git-Tag: 3.0.17-rc58~1
X-Git-Url: http://git.maemo.org/git/?p=modest;a=commitdiff_plain;h=e5c4ad03681b448912adaf378dc31d77c70b9ce2

Fixes NB#133759, do allow sending messages without subject
---

diff --git a/src/hildon2/modest-msg-edit-window.c b/src/hildon2/modest-msg-edit-window.c
index 3f4e514..b9e5022 100644
--- a/src/hildon2/modest-msg-edit-window.c
+++ b/src/hildon2/modest-msg-edit-window.c
@@ -914,6 +914,7 @@ init_window (ModestMsgEditWindow *obj)
 	priv->subject_field = hildon_entry_new (MODEST_EDITABLE_SIZE);
 	gtk_entry_set_max_length (GTK_ENTRY (priv->subject_field) ,SUBJECT_MAX_LENGTH);
 	g_object_set (G_OBJECT (priv->subject_field), "truncate-multiline", TRUE, NULL);
+	hildon_entry_set_placeholder ((HildonEntry *) priv->subject_field, _("mail_va_no_subject"));
 	hildon_gtk_entry_set_input_mode (GTK_ENTRY (priv->subject_field), 
 					 HILDON_GTK_INPUT_MODE_FULL | HILDON_GTK_INPUT_MODE_AUTOCAP);
 	gtk_box_pack_start (GTK_BOX (priv->subject_box), priv->subject_field, TRUE, TRUE, 0);
diff --git a/src/modest-main.c b/src/modest-main.c
index 31469d7..e84b2de 100644
--- a/src/modest-main.c
+++ b/src/modest-main.c
@@ -143,7 +143,7 @@ main (int argc, char *argv[])
 	MainSignalHandlers *handlers;
 	ModestTnyAccountStore *acc_store;
 
-	GError *error;
+	GError *error = NULL;
 	GOptionContext *context;
 
 	ModestWindowMgr *mgr;
diff --git a/src/modest-ui-actions.c b/src/modest-ui-actions.c
index 8e4185b..d70586d 100644
--- a/src/modest-ui-actions.c
+++ b/src/modest-ui-actions.c
@@ -3145,12 +3145,6 @@ 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:"",
diff --git a/src/modest-ui-dimming-rules.c b/src/modest-ui-dimming-rules.c
index a675958..011b495 100644
--- a/src/modest-ui-dimming-rules.c
+++ b/src/modest-ui-dimming-rules.c
@@ -1861,37 +1861,24 @@ modest_ui_dimming_rules_on_send (ModestWindow *win, gpointer user_data)
 {
 	ModestDimmingRule *rule = NULL;
 	gboolean dimmed = FALSE;
-	GtkWidget *subject_field, *body_field;
-	const gchar *subject = NULL;
+	GtkWidget *body_field;
 
 	g_return_val_if_fail (MODEST_IS_DIMMING_RULE (user_data), FALSE);
 	g_return_val_if_fail (MODEST_IS_MSG_EDIT_WINDOW (win), TRUE);
 	rule = MODEST_DIMMING_RULE (user_data);
 
-	body_field = modest_msg_edit_window_get_child_widget (
-							      MODEST_MSG_EDIT_WINDOW (win),
+	body_field = modest_msg_edit_window_get_child_widget (MODEST_MSG_EDIT_WINDOW (win),
 							      MODEST_MSG_EDIT_WINDOW_WIDGET_TYPE_BODY);
-	subject_field = modest_msg_edit_window_get_child_widget (
-								 MODEST_MSG_EDIT_WINDOW (win),
-								 MODEST_MSG_EDIT_WINDOW_WIDGET_TYPE_SUBJECT);
-	subject = gtk_entry_get_text (GTK_ENTRY (subject_field));
-
-	dimmed = (subject == NULL || subject[0] == '\0');
-	if (dimmed)
-		modest_dimming_rule_set_notification (rule, _("mcen_ib_subject_not_modified"));
 
 	if (!dimmed) {
 		GtkWidget *to_field, *cc_field, *bcc_field;
 		GtkTextBuffer * to_buffer, *cc_buffer, *bcc_buffer;
-		cc_field = modest_msg_edit_window_get_child_widget (
-			MODEST_MSG_EDIT_WINDOW (win),
-			MODEST_MSG_EDIT_WINDOW_WIDGET_TYPE_CC);
-		to_field = modest_msg_edit_window_get_child_widget (
-			MODEST_MSG_EDIT_WINDOW (win),
-			MODEST_MSG_EDIT_WINDOW_WIDGET_TYPE_TO);
-		bcc_field = modest_msg_edit_window_get_child_widget (
-			MODEST_MSG_EDIT_WINDOW (win),
-			MODEST_MSG_EDIT_WINDOW_WIDGET_TYPE_BCC);
+		cc_field = modest_msg_edit_window_get_child_widget (MODEST_MSG_EDIT_WINDOW (win),
+								    MODEST_MSG_EDIT_WINDOW_WIDGET_TYPE_CC);
+		to_field = modest_msg_edit_window_get_child_widget (MODEST_MSG_EDIT_WINDOW (win),
+								    MODEST_MSG_EDIT_WINDOW_WIDGET_TYPE_TO);
+		bcc_field = modest_msg_edit_window_get_child_widget (MODEST_MSG_EDIT_WINDOW (win),
+								     MODEST_MSG_EDIT_WINDOW_WIDGET_TYPE_BCC);
 		to_buffer = modest_recpt_editor_get_buffer (MODEST_RECPT_EDITOR (to_field));
 		cc_buffer = modest_recpt_editor_get_buffer (MODEST_RECPT_EDITOR (cc_field));
 		bcc_buffer = modest_recpt_editor_get_buffer (MODEST_RECPT_EDITOR (bcc_field));