X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fmaemo%2Fmodest-msg-edit-window.c;h=5354a71c062777f0c456b8241ae0ed113d9c5026;hb=23f786131a2e4d78a7a54f52edd53a0c906a9113;hp=89da6dda54d788280a5f248c9f64342fb464ab68;hpb=4cded6641b87db71547140e9c68020ff9ec126d6;p=modest

diff --git a/src/maemo/modest-msg-edit-window.c b/src/maemo/modest-msg-edit-window.c
index 89da6dd..5354a71 100644
--- a/src/maemo/modest-msg-edit-window.c
+++ b/src/maemo/modest-msg-edit-window.c
@@ -180,7 +180,7 @@ static void DEBUG_BUFFER (WPTextBuffer *buffer)
 {
 #ifdef DEBUG
 	GtkTextIter iter;
-	g_message ("BEGIN BUFFER OF SIZE %d", gtk_text_buffer_get_char_count (GTK_TEXT_BUFFER (buffer)));
+	g_debug ("BEGIN BUFFER OF SIZE %d", gtk_text_buffer_get_char_count (GTK_TEXT_BUFFER (buffer)));
 
 	gtk_text_buffer_get_start_iter (GTK_TEXT_BUFFER (buffer), &iter);
 	while (!gtk_text_iter_is_end (&iter)) {
@@ -207,11 +207,11 @@ static void DEBUG_BUFFER (WPTextBuffer *buffer)
 			g_string_append (output, " ");
 		}
 		output = g_string_append (output, "]\n");
-		g_message ("%s", output->str);
+		g_debug ("%s", output->str);
 		g_string_free (output, TRUE);
 		gtk_text_iter_forward_to_tag_toggle (&iter, NULL);
 	}
-	g_message ("END BUFFER");
+	g_debug ("END BUFFER");
 #endif
 }
 
@@ -1080,9 +1080,9 @@ get_related_images (ModestMsgEditWindow *self, TnyMsg *msg)
 
 	content_type = tny_mime_part_get_content_type (TNY_MIME_PART (msg));
 	
-	if (content_type && !g_strcasecmp (content_type, "multipart/related")) {
+	if (content_type && !g_ascii_strcasecmp (content_type, "multipart/related")) {
 		parent = g_object_ref (msg);
-	} else if (content_type && !g_strcasecmp (content_type, "multipart/mixed")) {
+	} else if (content_type && !g_ascii_strcasecmp (content_type, "multipart/mixed")) {
 		TnyList *parts = TNY_LIST (tny_simple_list_new ());
 		TnyIterator *iter;
 
@@ -1092,7 +1092,7 @@ get_related_images (ModestMsgEditWindow *self, TnyMsg *msg)
 			TnyMimePart *part;
 			part = TNY_MIME_PART (tny_iterator_get_current (iter));
 			content_type = tny_mime_part_get_content_type (part);
-			if (content_type && !g_strcasecmp (content_type, "multipart/related")) {
+			if (content_type && !g_ascii_strcasecmp (content_type, "multipart/related")) {
 				parent = part;
 				break;
 			} else {
@@ -2386,12 +2386,12 @@ modest_msg_edit_window_attach_file_one (ModestMsgEditWindow *window,
 		    info->valid_fields & GNOME_VFS_FILE_INFO_FIELDS_SIZE) {
 			size = info->size;
 			if (size > allowed_size) {
-				modest_platform_information_banner (NULL, NULL, 
-								    _FM("sfil_ib_opening_not_allowed"));
+				modest_platform_information_banner (NULL, NULL,
+								    _("mail_ib_error_attachment_size"));
 				return 0;
 			}
 		} else
-			g_warning ("%s: could not get attachment size", __FUNCTION__);
+			g_debug ("%s: could not get attachment size", __FUNCTION__);
 		
 		stream = create_stream_for_uri (uri);
 		
@@ -3178,7 +3178,8 @@ gboolean
 modest_msg_edit_window_check_names (ModestMsgEditWindow *window, gboolean add_to_addressbook)
 {
 	ModestMsgEditWindowPrivate *priv = NULL;
-	
+	GSList *address_list = NULL;
+
 	g_return_val_if_fail (MODEST_IS_MSG_EDIT_WINDOW (window), FALSE);
 	priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window);
 
@@ -3191,22 +3192,32 @@ modest_msg_edit_window_check_names (ModestMsgEditWindow *window, gboolean add_to
 		return FALSE;
 	}
 
-	if (!modest_address_book_check_names (MODEST_RECPT_EDITOR (priv->to_field),  add_to_addressbook)) {
+	/* Check names */
+	g_object_ref (window);
+	if (!modest_address_book_check_names (MODEST_RECPT_EDITOR (priv->to_field),  &address_list)) {
 		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),  add_to_addressbook)) {
+	if (!modest_address_book_check_names (MODEST_RECPT_EDITOR (priv->cc_field),  &address_list)) {
 		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), add_to_addressbook)) {
+	if (!modest_address_book_check_names (MODEST_RECPT_EDITOR (priv->bcc_field), &address_list)) {
 		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)
+		modest_address_book_add_address_list (address_list);
+
 	if (!modest_recpt_editor_has_focus (MODEST_RECPT_EDITOR (priv->cc_field)) &&
 	    !modest_recpt_editor_has_focus (MODEST_RECPT_EDITOR (priv->bcc_field)))
 		modest_recpt_editor_grab_focus (MODEST_RECPT_EDITOR (priv->to_field));
+	g_object_unref (window);
 
 	return TRUE;