2006-01-09 [paul] 1.9.100cvs126

[claws.git] / src / compose.c

diff --git a/src/compose.c b/src/compose.c
index 0b0425993900e0d2193e4f0049ee1d7b47b1afd7..6403e4f9a2c684c492f49da89fea66742a5c1dac 100644 (file)
--- a/src/compose.c
+++ b/src/compose.c
@@ -266,7 +266,8 @@ static gint compose_write_to_file           (Compose        *compose,
                                                 gint            action);
 static gint compose_write_body_to_file         (Compose        *compose,
                                                 const gchar    *file);
-static gint compose_remove_reedit_target       (Compose        *compose);
+static gint compose_remove_reedit_target       (Compose        *compose,
+                                                gboolean        force);
 void compose_remove_draft                      (Compose        *compose);
 static gint compose_queue                      (Compose        *compose,
                                                 gint           *msgnum,
@@ -3253,6 +3254,7 @@ static gboolean compose_join_next_line(Compose *compose,
                g_warning("alloc error scanning URIs\n"); \
        }
 
+static gboolean automatic_break = FALSE;
 static void compose_beautify_paragraph(Compose *compose, GtkTextIter *par_iter, gboolean force)
 {
        GtkTextView *text = GTK_TEXT_VIEW(compose->text);
@@ -3363,11 +3365,15 @@ static void compose_beautify_paragraph(Compose *compose, GtkTextIter *par_iter,
                                               quote_len)) {
                        GtkTextIter prev, next, cur;
                        
-                       if (prev_autowrap != FALSE || force)
+                       if (prev_autowrap != FALSE || force) {
+                               automatic_break = TRUE;
                                gtk_text_buffer_insert(buffer, &break_pos, "\n", 1);
-                       else if (quote_str && wrap_quote)
+                               automatic_break = FALSE;
+                       } else if (quote_str && wrap_quote) {
+                               automatic_break = TRUE;
                                gtk_text_buffer_insert(buffer, &break_pos, "\n", 1);
-                       else 
+                               automatic_break = FALSE;
+                       } else 
                                goto colorize;
                        /* remove trailing spaces */
                        cur = break_pos;
@@ -4272,7 +4278,7 @@ static gint compose_write_body_to_file(Compose *compose, const gchar *file)
        return 0;
 }
 
-static gint compose_remove_reedit_target(Compose *compose)
+static gint compose_remove_reedit_target(Compose *compose, gboolean force)
 {
        FolderItem *item;
        MsgInfo *msginfo = compose->targetinfo;
@@ -4280,6 +4286,9 @@ static gint compose_remove_reedit_target(Compose *compose)
        g_return_val_if_fail(compose->mode == COMPOSE_REEDIT, -1);
        if (!msginfo) return -1;
 
+       if (!force && MSG_IS_LOCKED(msginfo->flags))
+               return 0;
+
        item = msginfo->folder;
        g_return_val_if_fail(item != NULL, -1);
 
@@ -4360,9 +4369,6 @@ static gint compose_queue_sub(Compose *compose, gint *msgnum, FolderItem **item,
                }                       
        }
 
-        if (prefs_common.linewrap_at_send)
-               compose_wrap_all(compose);
-
        /* write queue header */
        tmp = g_strdup_printf("%s%cqueue.%p", get_tmp_dir(),
                              G_DIR_SEPARATOR, compose);
@@ -4519,7 +4525,7 @@ static gint compose_queue_sub(Compose *compose, gint *msgnum, FolderItem **item,
        g_free(tmp);
 
        if (compose->mode == COMPOSE_REEDIT) {
-               compose_remove_reedit_target(compose);
+               compose_remove_reedit_target(compose, FALSE);
        }
 
        if ((msgnum != NULL) && (item != NULL)) {
@@ -7011,6 +7017,7 @@ static void compose_draft_cb(gpointer data, guint action, GtkWidget *widget)
        static gboolean lock = FALSE;
        MsgInfo *newmsginfo;
        FILE *fp;
+       gboolean target_locked = FALSE;
        
        if (lock) return;
 
@@ -7068,6 +7075,11 @@ static void compose_draft_cb(gpointer data, guint action, GtkWidget *widget)
                goto unlock;
        }
        fclose(fp);
+       
+       if (compose->targetinfo) {
+               target_locked = MSG_IS_LOCKED(compose->targetinfo->flags);
+               flag.perm_flags = target_locked?MSG_LOCKED:0;
+       }
 
        folder_item_scan(draft);
        if ((msgnum = folder_item_add_msg(draft, tmp, &flag, TRUE)) < 0) {
@@ -7081,13 +7093,16 @@ static void compose_draft_cb(gpointer data, guint action, GtkWidget *widget)
        draft->mtime = 0;       /* force updating */
 
        if (compose->mode == COMPOSE_REEDIT) {
-               compose_remove_reedit_target(compose);
+               compose_remove_reedit_target(compose, TRUE);
        }
 
        newmsginfo = folder_item_get_msginfo(draft, msgnum);
        if (newmsginfo) {
                procmsg_msginfo_unset_flags(newmsginfo, ~0, ~0);
-               procmsg_msginfo_set_flags(newmsginfo, 0, MSG_DRAFT);
+               if (target_locked)
+                       procmsg_msginfo_set_flags(newmsginfo, MSG_LOCKED, MSG_DRAFT);
+               else
+                       procmsg_msginfo_set_flags(newmsginfo, 0, MSG_DRAFT);
                if (compose_use_attach(compose))
                        procmsg_msginfo_set_flags(newmsginfo, 0,
                                                  MSG_HAS_ATTACHMENT);
@@ -7107,7 +7122,10 @@ static void compose_draft_cb(gpointer data, guint action, GtkWidget *widget)
                gchar *path;
 
                path = folder_item_fetch_msg(draft, msgnum);
-               g_return_if_fail(path != NULL);
+               if (path == NULL) {
+                       debug_print("can't fetch %s:%d\n",draft->path, msgnum);
+                       goto unlock;
+               }
                if (g_stat(path, &s) < 0) {
                        FILE_OP_ERROR(path, "stat");
                        g_free(path);
@@ -7121,6 +7139,8 @@ static void compose_draft_cb(gpointer data, guint action, GtkWidget *widget)
                compose->targetinfo->size = s.st_size;
                compose->targetinfo->mtime = s.st_mtime;
                compose->targetinfo->folder = draft;
+               if (target_locked)
+                       procmsg_msginfo_set_flags(compose->targetinfo, MSG_LOCKED, 0);
                compose->mode = COMPOSE_REEDIT;
                
                if (action == COMPOSE_AUTO_SAVE) {
@@ -8114,11 +8134,13 @@ static void text_inserted(GtkTextBuffer *buffer, GtkTextIter *iter,
                gtk_text_buffer_get_iter_at_mark(buffer, iter, mark);
                gtk_text_buffer_place_cursor(buffer, iter);
        } else {
-               if (strcmp(text, "\n"))
+               if (strcmp(text, "\n") || automatic_break)
                        gtk_text_buffer_insert(buffer, iter, text, len);
-               else
+               else {
+                       debug_print("insert nowrap \\n\n");
                        gtk_text_buffer_insert_with_tags_by_name(buffer, 
                                iter, text, len, "no_join", NULL);
+               }
        }
        
        mark = gtk_text_buffer_create_mark(buffer, NULL, iter, FALSE);