rename 'Bounce' to 'Redirect'

[claws.git] / src / compose.c

diff --git a/src/compose.c b/src/compose.c
index e8ec3541f481c9312662dbf82bd267feb2936b0a..95b1d679a32a1982dcfe8f1419c21a72e4eb8617 100644 (file)
--- a/src/compose.c
+++ b/src/compose.c
@@ -669,7 +669,7 @@ Compose *compose_new(PrefsAccount *account)
        return compose_generic_new(account, NULL, NULL);
 }
 
-Compose *compose_bounce(PrefsAccount *account, MsgInfo *msginfo)
+Compose *compose_redirect(PrefsAccount *account, MsgInfo *msginfo)
 {
        Compose *c;
        gchar *filename;
@@ -681,7 +681,7 @@ Compose *compose_bounce(PrefsAccount *account, MsgInfo *msginfo)
        if (filename == NULL)
                return NULL;
 
-       c->bounce_filename = filename;
+       c->redirect_filename = filename;
 
        if (msginfo->subject)
                gtk_entry_set_text(GTK_ENTRY(c->subject_entry),
@@ -2851,8 +2851,8 @@ static gboolean compose_use_attach(Compose *compose) {
     return(gtk_clist_get_row_data(GTK_CLIST(compose->attach_clist), 0) != NULL);
 }
 
-static gint compose_bounce_write_headers_from_headerlist(Compose *compose, 
-                                                        FILE *fp)
+static gint compose_redirect_write_headers_from_headerlist(Compose *compose, 
+                                                          FILE *fp)
 {
        gchar buf[BUFFSIZE];
        gchar *str;
@@ -2864,7 +2864,7 @@ static gint compose_bounce_write_headers_from_headerlist(Compose *compose,
        gchar *cc_hdr;
        gchar *to_hdr;
 
-       debug_print(_("Writing bounce header\n"));
+       debug_print(_("Writing redirect header\n"));
 
        header_w_colon = g_strconcat("To:", NULL);
        to_hdr = (prefs_common.trans_hdr ? gettext(header_w_colon) : header_w_colon);
@@ -2902,7 +2902,7 @@ static gint compose_bounce_write_headers_from_headerlist(Compose *compose,
        return(0);
 }
 
-static gint compose_bounce_write_headers(Compose *compose, FILE *fp)
+static gint compose_redirect_write_headers(Compose *compose, FILE *fp)
 {
        gchar buf[BUFFSIZE];
        gchar *str;
@@ -2927,7 +2927,7 @@ static gint compose_bounce_write_headers(Compose *compose, FILE *fp)
                fprintf(fp, "Resent-From: %s\n", compose->account->address);
 
        /* To */
-       compose_bounce_write_headers_from_headerlist(compose, fp);
+       compose_redirect_write_headers_from_headerlist(compose, fp);
 
        /* separator between header and body */
        fputs("\n", fp);
@@ -2935,14 +2935,14 @@ static gint compose_bounce_write_headers(Compose *compose, FILE *fp)
        return 0;
 }
 
-static gint compose_bounce_write_to_file(Compose *compose, const gchar *file)
+static gint compose_redirect_write_to_file(Compose *compose, const gchar *file)
 {
        FILE *fp;
        FILE *fdest;
        size_t len;
        gchar buf[BUFFSIZE];
 
-       if ((fp = fopen(compose->bounce_filename, "rb")) == NULL) {
+       if ((fp = fopen(compose->redirect_filename, "rb")) == NULL) {
                FILE_OP_ERROR(file, "fopen");
                return -1;
        }
@@ -2970,7 +2970,7 @@ static gint compose_bounce_write_to_file(Compose *compose, const gchar *file)
                if (fputs(buf, fdest) == -1)
                        goto error;
 
-               if (!prefs_common.bounce_keep_from) {
+               if (!prefs_common.redirect_keep_from) {
                        if (g_strncasecmp(buf, "From:",
                                          strlen("From:")) == 0) {
                                fputs(" (by way of ", fdest);
@@ -2994,7 +2994,7 @@ static gint compose_bounce_write_to_file(Compose *compose, const gchar *file)
                        goto error;
        }
 
-       compose_bounce_write_headers(compose, fdest);
+       compose_redirect_write_headers(compose, fdest);
 
        while ((len = fread(buf, sizeof(gchar), sizeof(buf), fp)) > 0) {
                if (fwrite(buf, sizeof(gchar), len, fdest) != len) {
@@ -3329,8 +3329,8 @@ static gint compose_queue_sub(Compose *compose, gint *msgnum, FolderItem **item,
        tmp2 = g_strdup_printf("%s%ctmp%d", g_get_tmp_dir(),
                                      G_DIR_SEPARATOR, (gint)compose);
 
-       if (compose->bounce_filename != NULL) {
-               if (compose_bounce_write_to_file(compose, tmp2) < 0) {
+       if (compose->redirect_filename != NULL) {
+               if (compose_redirect_write_to_file(compose, tmp2) < 0) {
                        unlink(tmp2);
                        lock = FALSE;
                        return -1;
@@ -4658,7 +4658,7 @@ static Compose *compose_create(PrefsAccount *account, ComposeMode mode)
        compose->exteditor_readdes = -1;
        compose->exteditor_tag     = -1;
 
-       compose->bounce_filename = NULL;
+       compose->redirect_filename = NULL;
        compose->undostruct = undostruct;
 #if USE_PSPELL
        
@@ -5140,8 +5140,8 @@ static void compose_destroy(Compose *compose)
        g_free(compose->msgid);
        g_free(compose->boundary);
 
-       if (compose->bounce_filename)
-               g_free(compose->bounce_filename);
+       if (compose->redirect_filename)
+               g_free(compose->redirect_filename);
 
        g_free(compose->exteditor_file);
 
@@ -6146,7 +6146,7 @@ static void compose_attach_cb(gpointer data, guint action, GtkWidget *widget)
        Compose *compose = (Compose *)data;
        GList *file_list;
 
-       if (compose->bounce_filename != NULL)
+       if (compose->redirect_filename != NULL)
                return;
 
        file_list = filesel_select_multiple_files(_("Select file"), NULL);