untwist file selection logic - be explicit

[claws.git] / src / compose.c

diff --git a/src/compose.c b/src/compose.c
index d9a5d17698f991fd3a87103c5288a2177904dc03..ffb44b70cba27377f7f889af04338964ad6f82b5 100644 (file)
--- a/src/compose.c
+++ b/src/compose.c
@@ -732,6 +732,7 @@ Compose *compose_generic_new(PrefsAccount *account, const gchar *mailto, FolderI
        textview = GTK_TEXT_VIEW(compose->text);
        textbuf = gtk_text_view_get_buffer(textview);
 
+       undo_block(compose->undostruct);
 #ifdef USE_ASPELL
        if (item && item->prefs && item->prefs->enable_default_dictionary &&
            compose->gtkaspell) 
@@ -990,6 +991,7 @@ static void compose_generic_reply(MsgInfo *msginfo, gboolean quote,
        textview = (GTK_TEXT_VIEW(compose->text));
        textbuf = gtk_text_view_get_buffer(textview);
        
+       undo_block(compose->undostruct);
 #ifdef USE_ASPELL
        if (msginfo->folder && msginfo->folder->prefs && 
            msginfo->folder->prefs && 
@@ -2268,6 +2270,7 @@ static void compose_use_signing(Compose *compose, gboolean use_signing)
        ifactory = gtk_item_factory_from_widget(compose->menubar);
        menuitem = gtk_item_factory_get_item
                (ifactory, "/Message/Sign");
+
        gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem), 
                                       use_signing);
        compose_update_gnupg_mode_menu_item(compose);
@@ -4658,7 +4661,7 @@ static void compose_convert_header(gchar *dest, gint len, gchar *src,
 
        if (len < 1) return;
 
-       tmpstr = conv_codeset_strdup(src, CS_UTF_8, conv_get_current_charset_str());
+       tmpstr = g_strdup(src);
 
        subst_char(tmpstr, '\n', ' ');
        subst_char(tmpstr, '\r', ' ');
@@ -5226,10 +5229,6 @@ static Compose *compose_create(PrefsAccount *account, ComposeMode mode)
        clipboard = gtk_clipboard_get(GDK_SELECTION_PRIMARY);
        gtk_text_buffer_add_selection_clipboard(buffer, clipboard);
        
-       if (prefs_common.smart_wrapping) {      
-               gtk_text_view_set_wrap_mode(GTK_TEXT_VIEW(text), GTK_WRAP_WORD);
-       }               
-
        gtk_container_add(GTK_CONTAINER(scrolledwin), text);
 
        g_signal_connect_after(G_OBJECT(text), "size_allocate",
@@ -6623,6 +6622,8 @@ static void compose_draft_cb(gpointer data, guint action, GtkWidget *widget)
        if (newmsginfo) {
                procmsg_msginfo_unset_flags(newmsginfo, ~0, ~0);
                procmsg_msginfo_set_flags(newmsginfo, 0, MSG_DRAFT);
+               if (compose_use_attach(compose))
+                       procmsg_msginfo_set_flags(newmsginfo, 0, MSG_HAS_ATTACHMENT);
                procmsg_msginfo_free(newmsginfo);
        }
        
@@ -6669,7 +6670,7 @@ static void compose_attach_cb(gpointer data, guint action, GtkWidget *widget)
        if (compose->redirect_filename != NULL)
                return;
 
-       file_list = filesel_select_multiple_files(_("Select file"));
+       file_list = filesel_select_multiple_files_open(_("Select file"));
 
        if (file_list) {
                GList *tmp;
@@ -6690,7 +6691,7 @@ static void compose_insert_file_cb(gpointer data, guint action,
        Compose *compose = (Compose *)data;
        GList *file_list;
 
-       file_list = filesel_select_multiple_files(_("Select file"));
+       file_list = filesel_select_multiple_files_open(_("Select file"));
 
        if (file_list) {
                GList *tmp;
@@ -7255,7 +7256,6 @@ static void compose_toggle_autowrap_cb(gpointer data, guint action,
                                       GtkWidget *widget)
 {
        Compose *compose = (Compose *)data;
-
        compose->autowrap = GTK_CHECK_MENU_ITEM(widget)->active;
        if (compose->autowrap)
                compose_wrap_line_all_full(compose, TRUE);