remove gtk_window_set_wmclass()

[claws.git] / src / compose.c

diff --git a/src/compose.c b/src/compose.c
index 6487f64005bb266bf9addfaaf02fe74929c001f3..3f9d36bb87f5a879aa691d0c0debb56c8e8a0d59 100644 (file)
--- a/src/compose.c
+++ b/src/compose.c
@@ -2799,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++) {
@@ -2881,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++;
                                }
 
@@ -3719,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) {
@@ -4503,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,
@@ -5118,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();
@@ -5404,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"),
@@ -6670,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"));
+       file_list = filesel_select_multiple_files_open(_("Select file"));
 
        if (file_list) {
                GList *tmp;
@@ -6691,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"));
+       file_list = filesel_select_multiple_files_open(_("Select file"));
 
        if (file_list) {
                GList *tmp;