remove gtk_window_set_wmclass()
[claws.git] / src / compose.c
index bf988c02c1fe108b3ed61bec3051bd2e7e6efa44..3f9d36bb87f5a879aa691d0c0debb56c8e8a0d59 100644 (file)
@@ -48,8 +48,7 @@
 #include <gtk/gtklabel.h>
 #include <gtk/gtkscrolledwindow.h>
 #include <gtk/gtktreeview.h>
-#warning FIXME_GTK2
-/* #include <gtk/gtkthemes.h> */
+
 #include <gtk/gtkdnd.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -375,12 +374,18 @@ static void compose_allsel_cb             (Compose        *compose);
 static void compose_advanced_action_cb (Compose                   *compose,
                                         ComposeCallAdvancedAction  action);
 
-static void compose_grab_focus_cb      (GtkWidget      *widget,
+static gboolean compose_grab_focus_cb  (GtkWidget      *widget,
+                                        Compose        *compose);
+static gboolean compose_grab_focus_before_cb   (GtkWidget      *widget,
                                         Compose        *compose);
 
 static void compose_changed_cb         (GtkTextBuffer  *textbuf,
                                         Compose        *compose);
 
+static void compose_toggle_autowrap_cb (gpointer        data,
+                                        guint           action,
+                                        GtkWidget      *widget);
+
 #if 0
 static void compose_toggle_to_cb       (gpointer        data,
                                         guint           action,
@@ -603,6 +608,8 @@ static GtkItemFactoryEntry compose_entries[] =
                                        "<control>L", compose_wrap_line, 0, NULL},
        {N_("/_Edit/Wrap all long _lines"),
                                        "<control><alt>L", compose_wrap_line_all, 0, NULL},
+       {N_("/_Edit/Aut_o wrapping"),   "<shift><control>L", compose_toggle_autowrap_cb, 0, "<ToggleItem>"},
+       {N_("/_Edit/---"),              NULL, NULL, 0, "<Separator>"},
        {N_("/_Edit/Edit with e_xternal editor"),
                                        "<shift><control>X", compose_ext_editor_cb, 0, NULL},
 #if USE_ASPELL
@@ -725,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) 
@@ -746,7 +754,7 @@ Compose *compose_generic_new(PrefsAccount *account, const gchar *mailto, FolderI
                        compose_entry_mark_default_to(compose, item->prefs->default_to);
                }
                if (item && item->ret_rcpt) {
-                       menu_set_toggle(ifactory, "/Message/Request Return Receipt", TRUE);
+                       menu_set_active(ifactory, "/Message/Request Return Receipt", TRUE);
                }
        } else {
                if (mailto) {
@@ -955,7 +963,7 @@ static void compose_generic_reply(MsgInfo *msginfo, gboolean quote,
        compose = compose_create(account, COMPOSE_REPLY);
        ifactory = gtk_item_factory_from_widget(compose->menubar);
 
-       menu_set_toggle(ifactory, "/Message/Remove references", FALSE);
+       menu_set_active(ifactory, "/Message/Remove references", FALSE);
        menu_set_sensitive(ifactory, "/Message/Remove references", TRUE);
 
        compose->replyinfo = procmsg_msginfo_get_full_info(msginfo);
@@ -963,7 +971,7 @@ static void compose_generic_reply(MsgInfo *msginfo, gboolean quote,
                compose->replyinfo = procmsg_msginfo_copy(msginfo);
 
        if (msginfo->folder && msginfo->folder->ret_rcpt)
-               menu_set_toggle(ifactory, "/Message/Request Return Receipt", TRUE);
+               menu_set_active(ifactory, "/Message/Request Return Receipt", TRUE);
 
        /* Set save folder */
        if (msginfo->folder && msginfo->folder->prefs && msginfo->folder->prefs->save_copy_to_folder) {
@@ -983,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 && 
@@ -1803,17 +1812,24 @@ static gchar *compose_quote_fmt(Compose *compose, MsgInfo *msginfo,
                g_signal_handlers_block_by_func(G_OBJECT(buffer),
                                        G_CALLBACK(compose_changed_cb),
                                        compose);
+               g_signal_handlers_block_by_func(G_OBJECT(buffer),
+                                       G_CALLBACK(text_inserted),
+                                       compose);
                
                mark = gtk_text_buffer_get_insert(buffer);
                gtk_text_buffer_get_iter_at_mark(buffer, &iter, mark);
 
                lastp = strchr(p, '\n');
                len = lastp ? lastp - p + 1 : -1;
+
                gtk_text_buffer_insert(buffer, &iter, p, len);
 
                g_signal_handlers_unblock_by_func(G_OBJECT(buffer),
                                        G_CALLBACK(compose_changed_cb),
                                        compose);
+               g_signal_handlers_unblock_by_func(G_OBJECT(buffer),
+                                       G_CALLBACK(text_inserted),
+                                       compose);
                
                if (lastp)
                        p = lastp + 1;
@@ -2118,9 +2134,11 @@ static ComposeInsertResult compose_insert_file(Compose *compose, const gchar *fi
        mark = gtk_text_buffer_get_insert(buffer);
        gtk_text_buffer_get_iter_at_mark(buffer, &iter, mark);
 
+       g_signal_handlers_block_by_func(G_OBJECT(buffer),
+                                       G_CALLBACK(text_inserted),
+                                       compose);
+
        while (fgets(buf, sizeof(buf), fp) != NULL) {
-#warning FIXME_GTK2
-#if 1 /* FIXME_GTK2 */
                const gchar *cur_encoding = conv_get_current_charset_str();
                gchar *str = conv_codeset_strdup(buf, cur_encoding, CS_UTF_8);
 
@@ -2137,9 +2155,12 @@ static ComposeInsertResult compose_insert_file(Compose *compose, const gchar *fi
                gtk_text_buffer_insert(buffer, &iter, str, -1);
 
                g_free (str);
-#endif /* FIXME_GTK2 */
        }
 
+       g_signal_handlers_unblock_by_func(G_OBJECT(buffer),
+                                         G_CALLBACK(text_inserted),
+                                         compose);
+
        fclose(fp);
 
        if (badtxt)
@@ -2179,13 +2200,9 @@ static void compose_attach_append(Compose *compose, const gchar *file,
 #if 0 /* NEW COMPOSE GUI */
        if (!compose->use_attach) {
                GtkItemFactory *ifactory;
-               GtkWidget *menuitem;
 
                ifactory = gtk_item_factory_from_widget(compose->menubar);
-               menuitem = gtk_item_factory_get_item(ifactory,
-                                                    "/View/Attachment");
-               gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem),
-                                              TRUE);
+               menu_set_active(ifactory, "/View/Attachment", TRUE);
        }
 #endif
        ainfo = g_new0(AttachInfo, 1);
@@ -2253,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);
@@ -2396,7 +2414,6 @@ static void compose_attach_parts(Compose *compose, MsgInfo *msginfo)
 
 #define SPACE_CHARS    " \t"
 
-#warning FIXME_GTK2
 static void compose_wrap_line(Compose *compose)
 {
        GtkTextView *text = GTK_TEXT_VIEW(compose->text);
@@ -2707,6 +2724,35 @@ static guint ins_quote(GtkTextBuffer *textbuf, GtkTextIter *iter,
        return ins_len;
 }
 
+static gboolean is_sig_separator(Compose *compose, GtkTextBuffer *textbuf, guint start_pos) 
+{
+       char *text = NULL;
+       GtkTextIter iter; 
+       GtkTextIter end_iter;
+       if (!compose->account->sig_sep)
+               return FALSE;
+       
+       gtk_text_buffer_get_iter_at_offset(textbuf, &iter, start_pos+1);
+       gtk_text_buffer_get_iter_at_offset(textbuf, &end_iter,
+               start_pos+strlen(compose->account->sig_sep)+1);
+
+       if (!strcmp(gtk_text_iter_get_text(&iter, &end_iter),
+                       compose->account->sig_sep)) {
+               /* check \n */
+               gtk_text_buffer_get_iter_at_offset(textbuf, &iter,
+                       start_pos+strlen(compose->account->sig_sep)+1);
+               gtk_text_buffer_get_iter_at_offset(textbuf, &end_iter,
+                       start_pos+strlen(compose->account->sig_sep)+2);
+
+               if (!strcmp(gtk_text_iter_get_text(&iter, &end_iter),"\n"));
+                       return TRUE;
+               
+
+       }
+
+       return FALSE;
+}
+
 /* check if we should join the next line */
 static gboolean join_next_line_is_needed(GtkTextBuffer *textbuf,
                                         guint start_pos, guint tlen,
@@ -2723,6 +2769,7 @@ static gboolean join_next_line_is_needed(GtkTextBuffer *textbuf,
                gtk_text_buffer_get_iter_at_offset(textbuf, &iter,
                                                   start_pos + indent_len);
                GET_CHAR(&iter, cbuf, ch_len);
+               
                if (ch_len > 0 && (cbuf[0] != '\n'))
                        do_join = TRUE;
        }
@@ -2752,7 +2799,8 @@ static void compose_wrap_line_all_full(Compose *compose, gboolean autowrap)
        guint linewrap_len = prefs_common.linewrap_len;
        gchar *qfmt = prefs_common.quotemark;
        gchar cbuf[CHAR_BUF_SIZE];
-
+       GtkTextMark *cursor_mark = gtk_text_buffer_get_insert(textbuf);
+       
        tlen = gtk_text_buffer_get_char_count(textbuf);
 
        for (; cur_pos < tlen; cur_pos++) {
@@ -2770,15 +2818,11 @@ static void compose_wrap_line_all_full(Compose *compose, gboolean autowrap)
 
                /* fix line length for tabs */
                if (ch_len == 1 && *cbuf == '\t') {
-#warning FIXME_GTK2
-                       /* guint tab_width = text->default_tab_width; */
                        guint tab_width = 8;
                        guint tab_offset = line_len % tab_width;
 
-                       if (tab_offset) {
-                               line_len += tab_width - tab_offset - 1;
-                               cur_len = line_len;
-                       }
+                       line_len += tab_width - tab_offset - 1;
+                       cur_len = line_len;
                }
 
                /* we have encountered line break */
@@ -2788,10 +2832,11 @@ static void compose_wrap_line_all_full(Compose *compose, gboolean autowrap)
 
                        /* should we join the next line */
                        if ((autowrap || i_len != cur_len) && do_delete &&
+                       !is_sig_separator(compose, textbuf, cur_pos+i_len) &&
                            join_next_line_is_needed
-                               (textbuf, cur_pos + 1, tlen, i_len, autowrap))
+                               (textbuf, cur_pos + 1, tlen, i_len, autowrap)) {
                                do_delete = TRUE;
-                       else
+                       else
                                do_delete = FALSE;
 
                        /* skip delete if it is continuous URL */
@@ -2837,8 +2882,20 @@ static void compose_wrap_line_all_full(Compose *compose, gboolean autowrap)
                                /* insert space if it's alphanumeric */
                                if ((cur_pos != line_pos) &&
                                    ((clen > 1) || isalnum((guchar)cb[0]))) {
+                                       GtkTextIter cursor_iter;
+                                       gboolean go_back = FALSE;
+                                       gtk_text_buffer_get_iter_at_mark(textbuf, &cursor_iter, cursor_mark);
+                                       if (gtk_text_iter_get_offset(&iter) ==
+                                                gtk_text_iter_get_offset(&cursor_iter))
+                                               go_back = TRUE;
+                                       
                                        gtk_text_buffer_insert(textbuf, &iter,
                                                               " ", 1);
+                                       if (go_back) {
+                                               gtk_text_buffer_get_iter_at_mark(textbuf, &cursor_iter, cursor_mark);
+                                               gtk_text_iter_backward_chars(&cursor_iter, 1);
+                                               gtk_text_buffer_place_cursor(textbuf, &cursor_iter);
+                                       }
                                        tlen++;
                                }
 
@@ -2964,9 +3021,9 @@ static void compose_wrap_line_all_full(Compose *compose, gboolean autowrap)
                        /* start over with current line */
                        is_new_line = TRUE;
                        line_len = cur_len = 0;
-                       if (autowrap || i_len > 0)
+                       if (autowrap || i_len > 0) {
                                do_delete = TRUE;
-                       else
+                       else
                                do_delete = FALSE;
 #ifdef WRAP_DEBUG
                        g_print("after CR insert ");
@@ -3060,7 +3117,6 @@ compose_current_mail_account(void)
 static void compose_select_account(Compose *compose, PrefsAccount *account,
                                   gboolean init)
 {
-       GtkWidget *menuitem;
        GtkItemFactory *ifactory;
 
        g_return_if_fail(account != NULL);
@@ -3077,15 +3133,10 @@ static void compose_select_account(Compose *compose, PrefsAccount *account,
                gtk_table_set_row_spacing(GTK_TABLE(compose->table), 2, 4);
                compose->use_newsgroups = TRUE;
 
-               menuitem = gtk_item_factory_get_item(ifactory, "/View/To");
-               gtk_check_menu_item_set_active
-                       (GTK_CHECK_MENU_ITEM(menuitem), FALSE);
-               gtk_widget_set_sensitive(menuitem, TRUE);
-               menuitem = gtk_item_factory_get_item(ifactory, "/View/Cc");
-               gtk_check_menu_item_set_active
-                       (GTK_CHECK_MENU_ITEM(menuitem), FALSE);
-               gtk_widget_set_sensitive(menuitem, TRUE);
-
+               menu_set_active(ifactory, "/View/To", FALSE);
+               menu_set_sensitive(ifactory, "/View/To", TRUE);
+               menu_set_active(ifactory, "/View/Cc", FALSE);
+               menu_set_sensitive(ifactory, "/View/Cc", TRUE);
                menu_set_sensitive(ifactory, "/View/Followup to", TRUE);
        } else {
                gtk_widget_hide(compose->newsgroups_hbox);
@@ -3094,19 +3145,12 @@ static void compose_select_account(Compose *compose, PrefsAccount *account,
                gtk_widget_queue_resize(compose->table_vbox);
                compose->use_newsgroups = FALSE;
 
-               menuitem = gtk_item_factory_get_item(ifactory, "/View/To");
-               gtk_check_menu_item_set_active
-                       (GTK_CHECK_MENU_ITEM(menuitem), TRUE);
-               gtk_widget_set_sensitive(menuitem, FALSE);
-               menuitem = gtk_item_factory_get_item(ifactory, "/View/Cc");
-               gtk_check_menu_item_set_active
-                       (GTK_CHECK_MENU_ITEM(menuitem), TRUE);
-               gtk_widget_set_sensitive(menuitem, FALSE);
-
-               menuitem = gtk_item_factory_get_item(ifactory, "/View/Followup to");
-               gtk_check_menu_item_set_active
-                       (GTK_CHECK_MENU_ITEM(menuitem), FALSE);
-               gtk_widget_set_sensitive(menuitem, FALSE);
+               menu_set_active(ifactory, "/View/To", TRUE);
+               menu_set_sensitive(ifactory, "/View/To", FALSE);
+               menu_set_active(ifactory, "/View/Cc", TRUE);
+               menu_set_sensitive(ifactory, "/View/Cc", FALSE);
+               menu_set_active(ifactory, "/View/Followup to", FALSE);
+               menu_set_sensitive(ifactory, "/View/Followup to", FALSE);
        }
 
        if (account->set_autocc) {
@@ -3128,18 +3172,17 @@ static void compose_select_account(Compose *compose, PrefsAccount *account,
                                          COMPOSE_ENTRY_REPLY_TO);
        }
 
-       menuitem = gtk_item_factory_get_item(ifactory, "/View/Ruler");
-       gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem),
-                                      prefs_common.show_ruler);
 #endif
 
 #if USE_GPGME
-       menuitem = gtk_item_factory_get_item(ifactory, "/Message/Sign");
-       gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem),
-                                      account->default_sign);
-       menuitem = gtk_item_factory_get_item(ifactory, "/Message/Encrypt");
-       gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem),
-                                      account->default_encrypt);
+       if (account->default_sign)
+               menu_set_active(ifactory, "/Message/Sign", TRUE);
+       else
+               menu_set_active(ifactory, "/Message/Sign", FALSE);
+       if (account->default_encrypt)
+               menu_set_active(ifactory, "/Message/Encrypt", TRUE);
+       else
+               menu_set_active(ifactory, "/Message/Encrypt", FALSE);
                                       
        activate_gnupg_mode(compose, account);          
 #endif /* USE_GPGME */
@@ -3265,8 +3308,8 @@ gint compose_send(Compose *compose)
        }
 
        /* write to temporary file */
-       g_snprintf(tmp, sizeof(tmp), "%s%ctmpmsg.%08x",
-                  get_tmp_dir(), G_DIR_SEPARATOR, (gint)compose);
+       g_snprintf(tmp, sizeof(tmp), "%s%ctmpmsg.%p",
+                  get_tmp_dir(), G_DIR_SEPARATOR, compose);
 
        if (prefs_common.linewrap_at_send)
                compose_wrap_line_all(compose);
@@ -3451,7 +3494,7 @@ static gint compose_redirect_write_headers(Compose *compose, FILE *fp)
        /* Resent-Message-ID */
        if (compose->account->gen_msgid) {
                compose_generate_msgid(buf, sizeof(buf));
-               fprintf(fp, "Resent-Message-Id: <%s>\n", buf);
+               fprintf(fp, "Resent-Message-ID: <%s>\n", buf);
                compose->msgid = g_strdup(buf);
        }
 
@@ -3676,16 +3719,7 @@ static gint compose_write_to_file(Compose *compose, const gchar *file,
                        encoding = ENC_BASE64;
 #endif
 
-#warning FIXME_GTK2
-#if 0 /* FIXME_GTK2 */
-               src_codeset = conv_get_current_charset_str();
-               /* if current encoding is US-ASCII, set it the same as
-                  outgoing one to prevent code conversion failure */
-               if (!strcasecmp(src_codeset, CS_US_ASCII))
-                       src_codeset = out_codeset;
-#else /* FIXME_GTK2 */
                src_codeset = CS_UTF_8;
-#endif /* FIXME_GTK2 */
 
                debug_print("src encoding = %s, out encoding = %s, transfer encoding = %s\n",
                            src_codeset, out_codeset, procmime_get_encoding_str(encoding));
@@ -3698,8 +3732,8 @@ static gint compose_write_to_file(Compose *compose, const gchar *file,
                        msg = g_strdup_printf(_("Can't convert the character encoding of the message from\n"
                                                "%s to %s.\n"
                                                "Send it anyway?"), src_codeset, out_codeset);
-                       aval = alertpanel
-                               (_("Error"), msg, _("Yes"), _("+No"), NULL);
+                       aval = alertpanel_with_type
+                               (_("Error"), msg, _("Yes"), _("+No"), NULL, NULL, ALERT_ERROR);
                        g_free(msg);
 
                        if (aval != G_ALERTDEFAULT) {
@@ -3871,14 +3905,11 @@ static gint compose_write_body_to_file(Compose *compose, const gchar *file)
        gtk_text_buffer_get_end_iter(buffer, &end);
        tmp = gtk_text_buffer_get_text(buffer, &start, &end, FALSE);
 
-#warning FIXME_GTK2
-#if 1 /* FIXME_GTK2 */
        src_codeset = CS_UTF_8;
        dest_codeset = conv_get_current_charset_str();
        chars = conv_codeset_strdup(tmp, src_codeset, dest_codeset);
        g_free(tmp);
        if (!chars) return -1;
-#endif /* FIXME_GTK2 */
 
        /* write body */
        len = strlen(chars);
@@ -4294,12 +4325,7 @@ static gint compose_write_headers_from_headerlist(Compose *compose,
 
                if (!g_strcasecmp(trans_hdr, headerentryname)) {
                        const gchar *entstr = gtk_entry_get_text(GTK_ENTRY(headerentry->entry));
-#warning FIXME_GTK2
-#if 1
                        gchar *tmpstr = conv_codeset_strdup(entstr, CS_UTF_8, conv_get_current_charset_str());
-#else
-                       gchar *tmpstr = strdup(entstr);
-#endif
                        Xstrdup_a(str, tmpstr, return -1);
                        g_strstrip(str);
                        if (str[0] != '\0') {
@@ -4439,7 +4465,7 @@ static gint compose_write_headers(Compose *compose, FILE *fp,
        /* Message-ID */
        if (compose->account->gen_msgid) {
                compose_generate_msgid(buf, sizeof(buf));
-               fprintf(fp, "Message-Id: <%s>\n", buf);
+               fprintf(fp, "Message-ID: <%s>\n", buf);
                compose->msgid = g_strdup(buf);
        }
 
@@ -4490,6 +4516,7 @@ static gint compose_write_headers(Compose *compose, FILE *fp,
 #endif
        /* Organization */
        if (compose->account->organization &&
+           strlen(compose->account->organization) &&
            !IS_IN_CUSTOM_HEADER("Organization")) {
                compose_convert_header(buf, sizeof(buf),
                                       compose->account->organization,
@@ -4648,12 +4675,7 @@ static void compose_convert_header(gchar *dest, gint len, gchar *src,
 
        if (len < 1) return;
 
-#warning FIXME_GTK2
-#if 1
-       tmpstr = conv_codeset_strdup(src, CS_UTF_8, conv_get_current_charset_str());
-#else
-       tmpstr = strdup(src);
-#endif
+       tmpstr = g_strdup(src);
 
        subst_char(tmpstr, '\n', ' ');
        subst_char(tmpstr, '\r', ' ');
@@ -4736,6 +4758,10 @@ static void compose_create_header_entry(Compose *compose)
        }
        if (header)
                gtk_entry_set_text(GTK_ENTRY(GTK_COMBO(combo)->entry), header);
+       g_signal_connect(G_OBJECT(GTK_COMBO(combo)->entry), "grab_focus",
+                        G_CALLBACK(compose_grab_focus_before_cb), compose);
+       g_signal_connect_after(G_OBJECT(GTK_COMBO(combo)->entry), "grab_focus",
+                        G_CALLBACK(compose_grab_focus_cb), compose);
 
        /* Entry field */
        entry = gtk_entry_new(); 
@@ -4751,6 +4777,8 @@ static void compose_create_header_entry(Compose *compose)
        g_signal_connect(G_OBJECT(entry), "activate", 
                         G_CALLBACK(text_activated), compose);
        g_signal_connect(G_OBJECT(entry), "grab_focus",
+                        G_CALLBACK(compose_grab_focus_before_cb), compose);
+       g_signal_connect_after(G_OBJECT(entry), "grab_focus",
                         G_CALLBACK(compose_grab_focus_cb), compose);
        g_signal_connect(G_OBJECT(entry), "button-press-event", 
                         G_CALLBACK(compose_headerentry_button_pressed),
@@ -5000,6 +5028,8 @@ static GtkWidget *compose_create_others(Compose *compose)
        gtk_table_attach_defaults(GTK_TABLE(table), savemsg_entry, 1, 2, rowcount, rowcount + 1);
        gtk_editable_set_editable(GTK_EDITABLE(savemsg_entry), prefs_common.savemsg);
        g_signal_connect(G_OBJECT(savemsg_entry), "grab_focus",
+                        G_CALLBACK(compose_grab_focus_before_cb), compose);
+       g_signal_connect_after(G_OBJECT(savemsg_entry), "grab_focus",
                         G_CALLBACK(compose_grab_focus_cb), compose);
        if (account_get_special_folder(compose->account, F_OUTBOX)) {
                folderidentifier = folder_item_get_identifier(account_get_special_folder
@@ -5102,9 +5132,8 @@ static Compose *compose_create(PrefsAccount *account, ComposeMode mode)
        compose->account = account;
 
        window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
-       gtk_window_set_policy(GTK_WINDOW(window), TRUE, TRUE, FALSE);
+       gtk_window_set_resizable(GTK_WINDOW(window), TRUE);
        gtk_widget_set_size_request(window, -1, prefs_common.compose_height);
-       gtk_window_set_wmclass(GTK_WINDOW(window), "compose window", "Sylpheed");
 
        if (!geometry.max_width) {
                geometry.max_width = gdk_screen_width();
@@ -5176,6 +5205,8 @@ static Compose *compose_create(PrefsAccount *account, ComposeMode mode)
        g_signal_connect(G_OBJECT(subject_entry), "activate", 
                         G_CALLBACK(text_activated), compose);
        g_signal_connect(G_OBJECT(subject_entry), "grab_focus",
+                        G_CALLBACK(compose_grab_focus_before_cb), compose);
+       g_signal_connect_after(G_OBJECT(subject_entry), "grab_focus",
                         G_CALLBACK(compose_grab_focus_cb), compose);
        gtk_widget_show(subject_entry);
        compose->subject_entry = subject_entry;
@@ -5210,36 +5241,9 @@ static Compose *compose_create(PrefsAccount *account, ComposeMode mode)
        gtk_text_view_set_editable(GTK_TEXT_VIEW(text), TRUE);
        clipboard = gtk_clipboard_get(GDK_SELECTION_PRIMARY);
        gtk_text_buffer_add_selection_clipboard(buffer, clipboard);
-#warning FIXME_GTK2
-       /* GTK_STEXT(text)->default_tab_width = 8; */
-
-#warning FIXME_GTK2
-#if 0
-       if (prefs_common.block_cursor) {
-               GTK_STEXT(text)->cursor_type = GTK_STEXT_CURSOR_BLOCK;
-       }
-#endif
        
-#warning FIXME_GTK2
-#if 0
-       if (prefs_common.smart_wrapping) {      
-               gtk_stext_set_word_wrap(GTK_STEXT(text), TRUE);
-               gtk_stext_set_wrap_rmargin(GTK_STEXT(text), prefs_common.linewrap_len);
-       }               
-#else
-       if (prefs_common.smart_wrapping) {      
-               gtk_text_view_set_wrap_mode(GTK_TEXT_VIEW(text), GTK_WRAP_WORD);
-       }               
-#endif
-
        gtk_container_add(GTK_CONTAINER(scrolledwin), text);
 
-#warning FIXME_GTK2
-#if 0 /* FIXME_GTK2 */
-       g_signal_connect(G_OBJECT(text), "activate",
-                        G_CALLBACK(text_activated), compose);
-#endif /* FIXME_GTK2 */
-
        g_signal_connect_after(G_OBJECT(text), "size_allocate",
                               G_CALLBACK(compose_edit_size_alloc),
                               ruler);
@@ -5268,19 +5272,7 @@ static Compose *compose_create(PrefsAccount *account, ComposeMode mode)
 
        style = gtk_widget_get_style(text);
 
-       /* workaround for the slow down of GtkSText when using Pixmap theme */
-#warning FIXME_GTK2
-#if 0 /* FIXME_GTK2 */
-       if (style->engine) {
-               GtkThemeEngine *engine;
-
-               engine = style->engine;
-               style->engine = NULL;
-               new_style = gtk_style_copy(style);
-               style->engine = engine;
-       } else
-#endif /* FIXME_GTK2 */
-               new_style = gtk_style_copy(style);
+       new_style = gtk_style_copy(style);
 
        if (prefs_common.textfont) {
                PangoFontDescription *font_desc;
@@ -5390,6 +5382,8 @@ static Compose *compose_create(PrefsAccount *account, ComposeMode mode)
        compose->msgid       = NULL;
        compose->boundary    = NULL;
 
+       compose->autowrap       = prefs_common.autowrap;
+
 #if USE_GPGME
        compose->use_signing    = FALSE;
        compose->use_encryption = FALSE;
@@ -5423,7 +5417,8 @@ static Compose *compose_create(PrefsAccount *account, ComposeMode mode)
                                                  prefs_common.misspelled_col,
                                                  prefs_common.check_while_typing,
                                                  prefs_common.use_alternate,
-                                                 GTK_TEXT_VIEW(text));
+                                                 GTK_TEXT_VIEW(text),
+                                                 GTK_WINDOW(compose->window));
                        if (!gtkaspell) {
                                alertpanel_error(_("Spell checker could not "
                                                "be started.\n%s"),
@@ -5453,6 +5448,8 @@ static Compose *compose_create(PrefsAccount *account, ComposeMode mode)
 
        compose_select_account(compose, account, TRUE);
 
+       menu_set_active(ifactory, "/Edit/Auto wrapping", prefs_common.autowrap);
+       menu_set_active(ifactory, "/View/Ruler", prefs_common.show_ruler);
        if (account->set_autocc && account->auto_cc && mode != COMPOSE_REEDIT)
                compose_entry_append(compose, account->auto_cc, COMPOSE_CC);
 
@@ -6639,6 +6636,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);
        }
        
@@ -6685,7 +6684,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"), NULL);
+       file_list = filesel_select_multiple_files_open(_("Select file"));
 
        if (file_list) {
                GList *tmp;
@@ -6706,7 +6705,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"), NULL);
+       file_list = filesel_select_multiple_files_open(_("Select file"));
 
        if (file_list) {
                GList *tmp;
@@ -7225,10 +7224,38 @@ static void compose_advanced_action_cb(Compose *compose,
        }
 }
 
-static void compose_grab_focus_cb(GtkWidget *widget, Compose *compose)
+static gchar *cliptext = NULL;
+
+static gboolean compose_grab_focus_before_cb(GtkWidget *widget, Compose *compose)
+{
+       gchar *str = NULL;
+       GtkClipboard *clip = gtk_clipboard_get(gdk_atom_intern("PRIMARY", FALSE));
+       if (cliptext)
+               g_free(cliptext);
+       if (gtk_clipboard_wait_is_text_available(clip))
+               cliptext = gtk_clipboard_wait_for_text(clip);
+       
+       return FALSE;
+}
+
+static gboolean compose_grab_focus_cb(GtkWidget *widget, Compose *compose)
 {
+       gchar *str = NULL;
+       GtkClipboard *clip = gtk_clipboard_get(gdk_atom_intern("PRIMARY", FALSE));
+       
+       if (GTK_IS_EDITABLE(widget)) {
+               str = gtk_editable_get_chars(GTK_EDITABLE(widget), 0, -1);
+               gtk_editable_set_position(GTK_EDITABLE(widget), 
+                       strlen(str));
+               g_free(str);
+       }
+       if (cliptext)
+               gtk_clipboard_set_text(clip, cliptext, -1);
+
        if (GTK_IS_EDITABLE(widget) || GTK_IS_TEXT_VIEW(widget))
                compose->focused_editable = widget;
+       
+       return TRUE;
 }
 
 static void compose_changed_cb(GtkTextBuffer *textbuf, Compose *compose)
@@ -7239,6 +7266,15 @@ static void compose_changed_cb(GtkTextBuffer *textbuf, Compose *compose)
        }
 }
 
+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);
+}
+
 #if 0 /* NEW COMPOSE GUI */
 static void compose_toggle_to_cb(gpointer data, guint action,
                                 GtkWidget *widget)