2008-11-22 [paul] 3.6.1cvs41

[claws.git] / src / compose.c

diff --git a/src/compose.c b/src/compose.c
index f3f83fcf72a6b162d0a1ac2b3b010f72f21d35fb..89a45cfbdd67963d01a8c1c80f7273afcd3475d3 100644 (file)
--- a/src/compose.c
+++ b/src/compose.c
@@ -5708,8 +5708,10 @@ static void compose_add_attachments(Compose *compose, MimeInfo *parent)
                        mimepart->disposition = DISPOSITIONTYPE_INLINE;
                } else {
                        if (ainfo->name) {
-                               g_hash_table_insert(mimepart->typeparameters,
-                                           g_strdup("name"), g_strdup(ainfo->name));
+                               if (mimepart->type == MIMETYPE_APPLICATION && 
+                                  !strcmp2(mimepart->subtype, "octet-stream"))
+                                       g_hash_table_insert(mimepart->typeparameters,
+                                                   g_strdup("name"), g_strdup(ainfo->name));
                                g_hash_table_insert(mimepart->dispositionparameters,
                                            g_strdup("filename"), g_strdup(ainfo->name));
                                mimepart->disposition = DISPOSITIONTYPE_ATTACHMENT;
@@ -6748,7 +6750,7 @@ static Compose *compose_create(PrefsAccount *account,
 #ifndef MAEMO
        MENUITEM_ADDUI_MANAGER(compose->ui_manager, "/", "Menu", NULL, GTK_UI_MANAGER_MENUBAR)
 #else
-       MENUITEM_ADDUI_MANAGER(compose->ui_manager, "/", "Menu", NULL, GTK_UI_MANAGER_MENU)
+       MENUITEM_ADDUI_MANAGER(compose->ui_manager, "/", "Menu", NULL, GTK_UI_MANAGER_POPUP)
 #endif
 
        MENUITEM_ADDUI_MANAGER(compose->ui_manager, "/Menu", "Message", "Message", GTK_UI_MANAGER_MENU)
@@ -8369,6 +8371,10 @@ static gboolean attach_property_key_pressed(GtkWidget *widget,
                *cancelled = TRUE;
                gtk_main_quit();
        }
+       if (event && event->keyval == GDK_Return) {
+               *cancelled = FALSE;
+               gtk_main_quit();
+       }
        return FALSE;
 }
 
@@ -8473,7 +8479,7 @@ static gint compose_exec_ext_editor_real(const gchar *file)
                g_snprintf(buf, sizeof(buf), prefs_common_get_ext_editor_cmd(), file);
        } else {
                if (prefs_common_get_ext_editor_cmd())
-                       g_warning("External editor command line is invalid: '%s'\n",
+                       g_warning("External editor command-line is invalid: '%s'\n",
                                  prefs_common_get_ext_editor_cmd());
                g_snprintf(buf, sizeof(buf), DEFAULT_EDITOR_CMD, file);
        }
@@ -8557,6 +8563,7 @@ static gboolean compose_input_cb(GIOChannel *source, GIOCondition condition,
                gtk_text_buffer_set_text(buffer, "", -1);
                compose_insert_file(compose, compose->exteditor_file);
                compose_changed_cb(NULL, compose);
+               compose_draft((gpointer)compose, COMPOSE_AUTO_SAVE);
 
                if (claws_unlink(compose->exteditor_file) < 0)
                        FILE_OP_ERROR(compose->exteditor_file, "unlink");
@@ -9396,6 +9403,8 @@ static void entry_paste_clipboard(Compose *compose, GtkWidget *entry,
                         * used for mid-click-pasting */
                        start = gtk_text_iter_get_offset(insert_place);
                        gtk_text_buffer_insert(buffer, insert_place, contents, strlen(contents));
+                       if (prefs_common.primary_paste_unselects)
+                               gtk_text_buffer_select_range(buffer, insert_place, insert_place);
                }
                
                if (!wrap) {