Replace the disposition option menu with a checkbox.

	* e-msg-composer-attachment.glade: Replace the disposition option
	menu with a checkbox.

	* e-msg-composer-select-file.c
	(e_msg_composer_select_file_attachment): New function to select a
	file to attach. Adds a "suggest inline disposition" checkbox.

	* e-msg-composer-attachment.c (e_msg_composer_attachment_new): Add
	a disposition argument rather than always defaulting to
	"attachment".
	(struct _DialogData, ok_cb, e_msg_composer_attachment_edit):
	Update for optionmenu->checkbox change for disposition.

	* e-msg-composer-attachment-bar.c (add_from_file): Add a
	disposition argument.
	(add_from_user): Use e_msg_composer_select_file_attachment, pass
	chosen disposition to add_from_file.
	(e_msg_composer_attachment_bar_attach): Pass "attachment" to
	add_from_file for the disposition.

svn path=/trunk/; revision=10200

1 files changed, 9 insertions, 5 deletions

diff --git a/composer/e-msg-composer-attachment-bar.c b/composer/e-msg-composer-attachment-bar.c
index b039a1f7a8..2c0f42f9ed 100644
--- a/composer/e-msg-composer-attachment-bar.c
+++ b/composer/e-msg-composer-attachment-bar.c
@@ -168,9 +168,10 @@ add_from_mime_part (EMsgComposerAttachmentBar *bar,
 
 static void
 add_from_file (EMsgComposerAttachmentBar *bar,
-	       const gchar *file_name)
+	       const gchar *file_name,
+	       const gchar *disposition)
 {
-	add_common (bar, e_msg_composer_attachment_new (file_name));
+	add_common (bar, e_msg_composer_attachment_new (file_name, disposition));
 }
 
 static void
@@ -420,12 +421,15 @@ add_from_user (EMsgComposerAttachmentBar *bar)
 {
 	EMsgComposer *composer;
 	char *file_name;
+	gboolean is_inline = FALSE;
 	
 	composer = E_MSG_COMPOSER (gtk_widget_get_toplevel (GTK_WIDGET (bar)));
 	
-	file_name = e_msg_composer_select_file (composer, _("Attach a file"));
+	file_name = e_msg_composer_select_file_attachment (composer, &is_inline);
+	if (!file_name)
+		return;
 	
-	add_from_file (bar, file_name);
+	add_from_file (bar, file_name, is_inline ? "inline" : "attachment");
 	
 	g_free (file_name);
 }
@@ -800,7 +804,7 @@ e_msg_composer_attachment_bar_attach (EMsgComposerAttachmentBar *bar,
 	if (file_name == NULL)
 		add_from_user (bar);
 	else
-		add_from_file (bar, file_name);
+		add_from_file (bar, file_name, "attachment");
 }
 
 void