untwist file selection logic - be explicit

[claws.git] / src / compose.c

diff --git a/src/compose.c b/src/compose.c
index 608bc3e6e77422151579aaf21cadd4eed5bb01f5..ffb44b70cba27377f7f889af04338964ad6f82b5 100644 (file)
--- a/src/compose.c
+++ b/src/compose.c
@@ -4661,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', ' ');
@@ -5229,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",
@@ -6674,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;
@@ -6695,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;