2006-07-05 [colin] 2.3.1cvs61

[claws.git] / src / compose.c

diff --git a/src/compose.c b/src/compose.c
index d4b7bf04d8f038c3009c2279ad4fd6fe59b1d953..2df9191b1d23dc762e7e1e9303395c81de097262 100644 (file)
--- a/src/compose.c
+++ b/src/compose.c
@@ -1812,6 +1812,9 @@ Compose *compose_reedit(MsgInfo *msginfo, gboolean batch)
                compose_destroy(compose);
                return NULL;
        }
+       
+       compose->sig_str = compose_get_signature_str(compose);
+       
        return compose;
 }
 
@@ -2683,7 +2686,9 @@ static void compose_insert_sig(Compose *compose, gboolean replace)
        GtkTextMark *mark;
        GtkTextIter iter, iter_end;
        gint cur_pos;
+       gchar *search = NULL;
        gboolean prev_autowrap;
+       gboolean found = FALSE, shift = FALSE;
 
        
        g_return_if_fail(compose->account != NULL);
@@ -2701,8 +2706,9 @@ static void compose_insert_sig(Compose *compose, gboolean replace)
 
        gtk_text_buffer_get_end_iter(buffer, &iter);
 
-       if (replace && compose->sig_str) {
-               gboolean found;
+       search = compose->sig_str;
+again:
+       if (replace && search) {
                GtkTextIter first_iter, start_iter, end_iter;
 
                gtk_text_buffer_get_start_iter(buffer, &first_iter);
@@ -2711,7 +2717,7 @@ static void compose_insert_sig(Compose *compose, gboolean replace)
                        found = FALSE;
                else
                        found = gtk_text_iter_forward_search(&first_iter,
-                                                            compose->sig_str,
+                                                            search,
                                                             GTK_TEXT_SEARCH_TEXT_ONLY,
                                                             &start_iter, &end_iter,
                                                             NULL);
@@ -2720,6 +2726,12 @@ static void compose_insert_sig(Compose *compose, gboolean replace)
                        gtk_text_buffer_delete(buffer, &start_iter, &end_iter);
                        iter = start_iter;
                }
+       } 
+       if (replace && !found && search && strlen(search) > 2
+       &&  search[0] == '\n' && search[1] == '\n') {
+               search ++;
+               shift = TRUE;
+               goto again;
        }
 
        g_free(compose->sig_str);
@@ -2728,7 +2740,10 @@ static void compose_insert_sig(Compose *compose, gboolean replace)
                compose->sig_str = g_strdup("");
 
        cur_pos = gtk_text_iter_get_offset(&iter);
-       gtk_text_buffer_insert(buffer, &iter, compose->sig_str, -1);
+       if (shift && found)
+               gtk_text_buffer_insert(buffer, &iter, compose->sig_str + 1, -1);
+       else
+               gtk_text_buffer_insert(buffer, &iter, compose->sig_str, -1);
        /* skip \n\n */
        gtk_text_buffer_get_iter_at_offset(buffer, &iter, cur_pos);
        gtk_text_iter_forward_char(&iter);
@@ -3505,6 +3520,7 @@ static void compose_beautify_paragraph(Compose *compose, GtkTextIter *par_iter,
                        {"http://",  strcasestr, get_uri_part,   make_uri_string},
                        {"https://", strcasestr, get_uri_part,   make_uri_string},
                        {"ftp://",   strcasestr, get_uri_part,   make_uri_string},
+                       {"sftp://",  strcasestr, get_uri_part,   make_uri_string},
                        {"www.",     strcasestr, get_uri_part,   make_http_string},
                        {"mailto:",  strcasestr, get_uri_part,   make_uri_string},
                        {"@",        strcasestr, get_email_part, make_email_string}
@@ -3881,8 +3897,11 @@ static void compose_select_account(Compose *compose, PrefsAccount *account,
                                       
        activate_privacy_system(compose, account, FALSE);
 
-       if (!init && compose->mode != COMPOSE_REDIRECT)
+       if (!init && compose->mode != COMPOSE_REDIRECT) {
+               undo_block(compose->undostruct);
                compose_insert_sig(compose, TRUE);
+               undo_unblock(compose->undostruct);
+       }
 }
 
 gboolean compose_check_for_valid_recipient(Compose *compose) {
@@ -4059,6 +4078,7 @@ gint compose_send(Compose *compose)
                        alertpanel_error(_("Could not queue message for sending:\n\n"
                                           "Charset conversion failed."));
                } else if (val == -3) {
+                       if (privacy_peek_error())
                        alertpanel_error(_("Could not queue message for sending:\n\n"
                                           "Signature failed: %s"), privacy_get_error());
                } else if (val == -2 && errno != 0) {
@@ -7519,6 +7539,7 @@ static void compose_send_later_cb(gpointer data, guint action,
        } else if (val == -2) {
                alertpanel_error(_("Could not queue message:\n\n%s."), strerror(errno));
        } else if (val == -3) {
+               if (privacy_peek_error())
                alertpanel_error(_("Could not queue message for sending:\n\n"
                                   "Signature failed: %s"), privacy_get_error());
        } else if (val == -4) {