compose.c: when switching accounts also switch savefolder; textview.c: respect Conten...

diff --git a/ChangeLog.claws b/ChangeLog.claws
index 53b9c5e417b2ea0e85d94f5fd8d20ee107439feb..c915371fc6a37da557b3ca370678d0687e54f993 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,12 @@
+2004-01-09 [paul]      0.9.8claws22
+
+       * src/compose.c
+               when changing account also change the save folder
+
+       * src/textview.c
+               if a text/plain attachment has 'Content-Disposition: attachment'
+               don't display it inline
+
 2004-01-08 [christoph] 0.9.8claws21
 
        * src/procmime.c

diff --git a/configure.ac b/configure.ac
index 92744307f40cf4a6f232c66d49dd58e8cec9257c..8f7902dd5b0875c8ca042b4917f2e5e20ed50898 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=8
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=21
+EXTRA_VERSION=22
 if test $EXTRA_VERSION -eq 0; then
     VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}claws
 else

diff --git a/src/compose.c b/src/compose.c
index 17cad87c669d91a40317f9b451428ef6ef338546..daf037acb5218b5cc7996f0bba980ea10abb31db 100644 (file)
--- a/src/compose.c
+++ b/src/compose.c
@@ -6280,6 +6280,7 @@ static void account_activated(GtkMenuItem *menuitem, gpointer data)
        Compose *compose = (Compose *)data;
 
        PrefsAccount *ac;
+       gchar *folderidentifier;
 
        ac = account_find_from_id(
                GPOINTER_TO_INT(gtk_object_get_user_data(GTK_OBJECT(menuitem))));
@@ -6287,6 +6288,21 @@ static void account_activated(GtkMenuItem *menuitem, gpointer data)
 
        if (ac != compose->account)
                compose_select_account(compose, ac, FALSE);
+
+       /* Set message save folder */
+       if (account_get_special_folder(compose->account, F_OUTBOX)) {
+               gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(compose->savemsg_checkbtn), prefs_common.savemsg);
+       }
+       gtk_signal_connect(GTK_OBJECT(compose->savemsg_checkbtn), "toggled",
+                          GTK_SIGNAL_FUNC(compose_savemsg_checkbtn_cb), compose);
+                          
+       gtk_editable_delete_text(GTK_EDITABLE(compose->savemsg_entry), 0, -1);
+       if (account_get_special_folder(compose->account, F_OUTBOX)) {
+               folderidentifier = folder_item_get_identifier(account_get_special_folder
+                                 (compose->account, F_OUTBOX));
+               gtk_entry_set_text(GTK_ENTRY(compose->savemsg_entry), folderidentifier);
+               g_free(folderidentifier);
+       }
 }
 
 static void attach_selected(GtkCList *clist, gint row, gint column,

diff --git a/src/textview.c b/src/textview.c
index 774c6177d3bf886ae0b1931c718ea7de6298af2b..c9e3597070ff9466ca246d05c3e2c72ecdb6ba65 100644 (file)
--- a/src/textview.c
+++ b/src/textview.c
@@ -452,7 +452,7 @@ static void textview_add_part(TextView *textview, MimeInfo *mimeinfo)
 
        if (mimeinfo->type != MIMETYPE_TEXT) {
                gtk_stext_insert(text, NULL, NULL, NULL, buf, -1);
-       } else {
+       } else if (mimeinfo->disposition != DISPOSITIONTYPE_ATTACHMENT) {
                if (prefs_common.display_header && (gtk_stext_get_length(text) > 0))
                        gtk_stext_insert(text, NULL, NULL, NULL, "\n", 1);
                if (textview->messageview->forced_charset)