rename 'Bounce' to 'Redirect'

diff --git a/ChangeLog.claws b/ChangeLog.claws
index e8912099240138e1838f392ff1140b3183dacb81..868e8fe0fffd0f3451bdcc48b424df6d86521d48 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,16 @@
+2002-05-23 [paul]      0.7.6claws13
+
+       * src/compose.[ch]
+         src/filtering.c
+         src/mainwindow.c
+         src/matcher.[ch]
+         src/matcher_parser_lex.l
+         src/matcher_parser_parse.y
+         src/prefs_common.[ch]
+         src/prefs_filtering.c
+         src/summaryview.c
+               rename 'Bounce' to 'Redirect'
+
 2002-05-23 [paul]      0.7.6claws12
 
        * more sync with 0.7.6cvs13

diff --git a/configure.in b/configure.in
index de5101ddc43e7debcb15d69802a7c163be99fca2..2860fc30d5161a6ef2abd5f7e5f8eb7d9534e2b3 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -8,7 +8,7 @@ MINOR_VERSION=7
 MICRO_VERSION=6
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=claws12
+EXTRA_VERSION=claws13
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target

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);

diff --git a/src/compose.h b/src/compose.h
index 89a30223fa6b374769b997fd4d6b9f31fe8fbdb2..7e988052b184938f61ca4f3a9d7566c4a7ea185c 100644 (file)
--- a/src/compose.h
+++ b/src/compose.h
@@ -62,7 +62,7 @@ typedef enum
        COMPOSE_FORWARD,
        COMPOSE_FORWARD_AS_ATTACH,
        COMPOSE_FORWARD_INLINE,
-       COMPOSE_BOUNCE,
+       COMPOSE_REDIRECT,
        COMPOSE_NEW,
        COMPOSE_REEDIT
 } ComposeMode;
@@ -199,7 +199,7 @@ struct _Compose
        /* Priority */
        gint priority;
 
-       gchar *bounce_filename;
+       gchar *redirect_filename;
 };
 
 struct _AttachInfo
@@ -235,7 +235,7 @@ Compose *compose_forward            (PrefsAccount *account,
                                         const gchar    *body);
 Compose *compose_forward_multiple      (PrefsAccount   *account, 
                                         GSList         *msginfo_list);
-Compose *compose_bounce                        (PrefsAccount   *account,
+Compose *compose_redirect              (PrefsAccount   *account,
                                         MsgInfo        *msginfo);
 void compose_reedit                    (MsgInfo        *msginfo);
 

diff --git a/src/filtering.c b/src/filtering.c
index 8505311a86f4127ead0a5f4b42fe6a7b7addc077..628a1334e8f47ffcbca2eebb15148f1f92abfb18 100644 (file)
--- a/src/filtering.c
+++ b/src/filtering.c
@@ -231,9 +231,9 @@ static gboolean filteringaction_apply(FilteringAction * action, MsgInfo * info,
                gtk_widget_destroy(compose->window);
                return FALSE;
 
-       case MATCHACTION_BOUNCE:
+       case MATCHACTION_REDIRECT:
                account = account_find_from_id(action->account_id);
-               compose = compose_bounce(account, info);
+               compose = compose_redirect(account, info);
                if (compose->account->protocol == A_NNTP)
                        break;
                else
@@ -297,7 +297,7 @@ static gboolean filtering_is_final_action(FilteringProp *filtering)
        case MATCHACTION_MARK_AS_UNREAD:
        case MATCHACTION_FORWARD:
        case MATCHACTION_FORWARD_AS_ATTACHMENT:
-       case MATCHACTION_BOUNCE:
+       case MATCHACTION_REDIRECT:
                return FALSE; /* MsgInfo still valid for message */
        default:
                return FALSE;
@@ -448,7 +448,7 @@ gchar *filteringaction_to_string(gchar *dest, gint destlen, FilteringAction *act
                g_snprintf(dest, destlen, "%s", command_str);
                return dest;
 
-       case MATCHACTION_BOUNCE:
+       case MATCHACTION_REDIRECT:
        case MATCHACTION_FORWARD:
        case MATCHACTION_FORWARD_AS_ATTACHMENT:
                g_snprintf(dest, destlen, "%s %d \"%s\"", command_str, action->account_id, action->destination); 

diff --git a/src/mainwindow.c b/src/mainwindow.c
index f13fd52a7fa57db5bec7313fcc75763d0a6b16d1..23afd53d4f3547e4ec033f66d937a0afa22006c4 100644 (file)
--- a/src/mainwindow.c
+++ b/src/mainwindow.c
@@ -683,7 +683,7 @@ static GtkItemFactoryEntry mainwin_entries[] =
        {N_("/_Message/Follow-up and reply to"), NULL, reply_cb, COMPOSE_FOLLOWUP_AND_REPLY_TO, NULL},
        {N_("/_Message/Reply to a_ll"),         "<shift><control>R", reply_cb, COMPOSE_REPLY_TO_ALL, NULL},
        {N_("/_Message/_Forward"),              "<control><alt>F", reply_cb, COMPOSE_FORWARD, NULL},
-       {N_("/_Message/Bounce"),                NULL, reply_cb, COMPOSE_BOUNCE, NULL},
+       {N_("/_Message/Redirect"),              NULL, reply_cb, COMPOSE_REDIRECT, NULL},
        {N_("/_Message/---"),                   NULL, NULL, 0, "<Separator>"},
        {N_("/_Message/Re-_edit"),              NULL, reedit_cb, 0, NULL},
        {N_("/_Message/---"),                   NULL, NULL, 0, "<Separator>"},
@@ -1669,7 +1669,7 @@ void main_window_set_menu_sensitive(MainWindow *mainwin)
                {"/Message/Reply to all"          , M_HAVE_ACCOUNT|M_SINGLE_TARGET_EXIST},
                {"/Message/Follow-up and reply to", M_HAVE_ACCOUNT|M_SINGLE_TARGET_EXIST|M_NEWS},
                {"/Message/Forward"               , M_HAVE_ACCOUNT|M_TARGET_EXIST},
-               {"/Message/Bounce"                , M_HAVE_ACCOUNT|M_SINGLE_TARGET_EXIST},
+               {"/Message/Redirect"              , M_HAVE_ACCOUNT|M_SINGLE_TARGET_EXIST},
                {"/Message/Re-edit"               , M_HAVE_ACCOUNT|M_ALLOW_REEDIT},
                {"/Message/Move..."               , M_TARGET_EXIST|M_ALLOW_DELETE|M_UNLOCKED},
                {"/Message/Copy..."               , M_TARGET_EXIST|M_EXEC|M_UNLOCKED},

diff --git a/src/matcher.c b/src/matcher.c
index f4765782b2f3e13b5917299b2a33331396b63328..a7f9f385a29efe94ca7aa682a30c3d5030639d79 100644 (file)
--- a/src/matcher.c
+++ b/src/matcher.c
@@ -91,7 +91,7 @@ static MatchParser matchparser_tab[] = {
        {MATCHACTION_FORWARD_AS_ATTACHMENT, "forward_as_attachment"},
        {MATCHACTION_EXECUTE, "execute"},
        {MATCHACTION_COLOR, "color"},
-       {MATCHACTION_BOUNCE, "bounce"},
+       {MATCHACTION_REDIRECT, "redirect"},
        {MATCHACTION_DELETE_ON_SERVER, "delete_on_server"}
 };
 

diff --git a/src/matcher.h b/src/matcher.h
index e5a3662bca8d2ec8915183fd7c879af1292b4efa..63cc56ea73d3d3619af17167d21ca4411933f4dd 100644 (file)
--- a/src/matcher.h
+++ b/src/matcher.h
@@ -76,7 +76,7 @@ enum {
        MATCHACTION_FORWARD,
        MATCHACTION_FORWARD_AS_ATTACHMENT,
        MATCHACTION_COLOR,
-       MATCHACTION_BOUNCE,
+       MATCHACTION_REDIRECT,
        MATCHACTION_DELETE_ON_SERVER,
        /* boolean operations */
        MATCHERBOOL_OR,

diff --git a/src/matcher_parser_lex.l b/src/matcher_parser_lex.l
index f747e16c16eba0b6be77504e32eae8086f4cd8f2..7f4c8455bc31142e98b41156c6d688e3c1956282 100644 (file)
--- a/src/matcher_parser_lex.l
+++ b/src/matcher_parser_lex.l
@@ -86,7 +86,7 @@ static void add_char(char ch)
 "forward"             return MATCHER_FORWARD;
 "forward_as_attachment"              return MATCHER_FORWARD_AS_ATTACHMENT;
 "color"         return MATCHER_COLOR;
-"bounce"       return MATCHER_BOUNCE;
+"redirect"     return MATCHER_REDIRECT;
 "delete_on_server"     return MATCHER_DELETE_ON_SERVER;
 [ \t]+
 "\n"           return MATCHER_EOL;

diff --git a/src/matcher_parser_parse.y b/src/matcher_parser_parse.y
index 0ba0abfaa8ee2385c84b35481b25492afcd18583..79aff3d9e1e19107639eb7b15943ebe637bcc358 100644 (file)
--- a/src/matcher_parser_parse.y
+++ b/src/matcher_parser_parse.y
@@ -162,7 +162,7 @@ int matcher_parserwrap(void)
 %token MATCHER_MARK_AS_READ  MATCHER_MARK_AS_UNREAD  MATCHER_FORWARD
 %token MATCHER_FORWARD_AS_ATTACHMENT  MATCHER_EOL  MATCHER_STRING  
 %token MATCHER_OR MATCHER_AND  
-%token MATCHER_COLOR MATCHER_SCORE_EQUAL MATCHER_BOUNCE MATCHER_DELETE_ON_SERVER
+%token MATCHER_COLOR MATCHER_SCORE_EQUAL MATCHER_REDIRECT MATCHER_DELETE_ON_SERVER
 %token MATCHER_SIZE_GREATER MATCHER_SIZE_SMALLER MATCHER_SIZE_EQUAL
 
 %start file
@@ -811,13 +811,13 @@ MATCHER_EXECUTE MATCHER_STRING
        destination = $3;
        action = filteringaction_new(action_type, account_id, destination, 0);
 }
-| MATCHER_BOUNCE MATCHER_INTEGER MATCHER_STRING
+| MATCHER_REDIRECT MATCHER_INTEGER MATCHER_STRING
 {
        gchar * destination = NULL;
        gint action_type = 0;
        gint account_id = 0;
 
-       action_type = MATCHACTION_BOUNCE;
+       action_type = MATCHACTION_REDIRECT;
        account_id = atoi($2);
        destination = $3;
        action = filteringaction_new(action_type, account_id, destination, 0);

diff --git a/src/prefs_common.c b/src/prefs_common.c
index f4c2e9944197ed3390e0407affad66768f43b2b3..72b57c825c0682c18c0411b31c2ac42c683a3e4b 100644 (file)
--- a/src/prefs_common.c
+++ b/src/prefs_common.c
@@ -125,7 +125,7 @@ static struct Compose {
 
        GtkWidget *checkbtn_quote;
        GtkWidget *checkbtn_forward_as_attachment;
-       GtkWidget *checkbtn_bounce_keep_from;
+       GtkWidget *checkbtn_redirect_keep_from;
        GtkWidget *checkbtn_smart_wrapping;
        GtkWidget *checkbtn_block_cursor;
        GtkWidget *checkbtn_reply_with_quote;
@@ -359,9 +359,9 @@ static PrefParam param[] = {
        {"forward_as_attachment", "FALSE", &prefs_common.forward_as_attachment,
         P_BOOL, &compose.checkbtn_forward_as_attachment,
         prefs_set_data_from_toggle, prefs_set_toggle},
-       {"bounce_keep_from", "FALSE",
-        &prefs_common.bounce_keep_from, P_BOOL,
-        &compose.checkbtn_bounce_keep_from,
+       {"redirect_keep_from", "FALSE",
+        &prefs_common.redirect_keep_from, P_BOOL,
+        &compose.checkbtn_redirect_keep_from,
         prefs_set_data_from_toggle, prefs_set_toggle},
        {"undo_level", "50", &prefs_common.undolevels, P_INT,
         &compose.spinbtn_undolevel,
@@ -1712,7 +1712,7 @@ static void prefs_compose_create(void)
        GtkWidget *frame_reply;
        GtkWidget *checkbtn_quote;
        GtkWidget *checkbtn_forward_as_attachment;
-       GtkWidget *checkbtn_bounce_keep_from;
+       GtkWidget *checkbtn_redirect_keep_from;
        GtkWidget *checkbtn_smart_wrapping;
        GtkWidget *checkbtn_block_cursor;
        GtkWidget *frame_msgwrap;
@@ -1793,8 +1793,8 @@ static void prefs_compose_create(void)
        PACK_CHECK_BUTTON (hbox5, checkbtn_block_cursor,
                          _("Block cursor"));
 
-       PACK_CHECK_BUTTON (vbox2, checkbtn_bounce_keep_from,
-                          _("Keep the original 'From' header when bouncing"));
+       PACK_CHECK_BUTTON (vbox2, checkbtn_redirect_keep_from,
+                          _("Keep the original 'From' header when redirecting"));
 
        hbox_undolevel = gtk_hbox_new (FALSE, 8);
        gtk_widget_show (hbox_undolevel);
@@ -1882,8 +1882,8 @@ static void prefs_compose_create(void)
 
        compose.checkbtn_forward_as_attachment =
                checkbtn_forward_as_attachment;
-       compose.checkbtn_bounce_keep_from =
-               checkbtn_bounce_keep_from;
+       compose.checkbtn_redirect_keep_from =
+               checkbtn_redirect_keep_from;
        compose.checkbtn_smart_wrapping = 
                checkbtn_smart_wrapping;
        compose.checkbtn_block_cursor   =

diff --git a/src/prefs_common.h b/src/prefs_common.h
index 4d07b357cc1ae1b9c8834c7d53e96fd511bfe712..f07ecb14b84e4d86ff6f92f8208097ed719b7a27 100644 (file)
--- a/src/prefs_common.h
+++ b/src/prefs_common.h
@@ -91,7 +91,7 @@ struct _PrefsCommon
        gchar *fw_quotemark;
        gchar *fw_quotefmt;
        gboolean forward_as_attachment;
-       gboolean bounce_keep_from;
+       gboolean redirect_keep_from;
        gboolean smart_wrapping;
        gboolean block_cursor;
        gchar *quote_chars;

diff --git a/src/prefs_filtering.c b/src/prefs_filtering.c
index 6cbbaf14019e7d43e894a84d07d181f1c09db8e6..733ca89b1c281a439925259d5d26205404158db5 100644 (file)
--- a/src/prefs_filtering.c
+++ b/src/prefs_filtering.c
@@ -128,7 +128,7 @@ enum {
        ACTION_MARK_AS_UNREAD = 6,
        ACTION_FORWARD = 7,
        ACTION_FORWARD_AS_ATTACHMENT = 8,
-       ACTION_BOUNCE = 9,
+       ACTION_REDIRECT = 9,
        ACTION_EXECUTE = 10,
        ACTION_COLOR = 11,
        ACTION_DELETE_ON_SERVER = 12,
@@ -206,8 +206,8 @@ static gint prefs_filtering_get_matching_from_action(gint action_id)
                return MATCHACTION_FORWARD;
        case ACTION_FORWARD_AS_ATTACHMENT:
                return MATCHACTION_FORWARD_AS_ATTACHMENT;
-       case ACTION_BOUNCE:
-               return MATCHACTION_BOUNCE;
+       case ACTION_REDIRECT:
+               return MATCHACTION_REDIRECT;
        case ACTION_EXECUTE:
                return MATCHACTION_EXECUTE;
        case ACTION_COLOR:
@@ -229,7 +229,7 @@ static gchar * action_text [] = {
        N_("Mark as unread"),
        N_("Forward"), 
        N_("Forward as attachment"), 
-       N_("Bounce"), 
+       N_("Redirect"), 
        N_("Execute"),
        N_("Color"),
        N_("Delete on Server")
@@ -887,7 +887,7 @@ static FilteringProp * prefs_filtering_dialog_to_filtering(void)
        case ACTION_COPY:
        case ACTION_FORWARD:
        case ACTION_FORWARD_AS_ATTACHMENT:
-       case ACTION_BOUNCE:
+       case ACTION_REDIRECT:
        case ACTION_EXECUTE:
                destination = gtk_entry_get_text(GTK_ENTRY(filtering.dest_entry));
                if (*destination == '\0') {
@@ -1075,10 +1075,10 @@ static void prefs_filtering_select_set(FilteringProp * prop)
                gtk_list_select_item(GTK_LIST(filtering.account_list),
                                     list_id);
                break;
-       case MATCHACTION_BOUNCE:
+       case MATCHACTION_REDIRECT:
                list_id = get_list_id_from_account_id(action->account_id);
                gtk_list_select_item(GTK_LIST(filtering.action_list),
-                                    ACTION_BOUNCE);
+                                    ACTION_REDIRECT);
                gtk_list_select_item(GTK_LIST(filtering.account_list),
                                     list_id);
                break;
@@ -1268,7 +1268,7 @@ static void prefs_filtering_action_select(GtkList *list,
                gtk_widget_hide(filtering.color_optmenu);
                gtk_widget_hide(filtering.color_label);
                break;
-       case ACTION_BOUNCE:
+       case ACTION_REDIRECT:
                gtk_widget_set_sensitive(filtering.account_combo, TRUE);
                gtk_widget_show(filtering.dest_entry);
                gtk_widget_set_sensitive(filtering.dest_entry, TRUE);

diff --git a/src/summaryview.c b/src/summaryview.c
index 5409843b723a7c1e963ae167f9faede7085cb2ca..e553acd1d9d542178017acf262e180486ac4399c 100644 (file)
--- a/src/summaryview.c
+++ b/src/summaryview.c
@@ -398,7 +398,7 @@ static GtkItemFactoryEntry summary_popup_entries[] =
        {N_("/Follow-up and reply to"), NULL, summary_reply_cb, COMPOSE_FOLLOWUP_AND_REPLY_TO, NULL},
        {N_("/Reply to a_ll"),          NULL, summary_reply_cb, COMPOSE_REPLY_TO_ALL, NULL},
        {N_("/_Forward"),               NULL, summary_reply_cb, COMPOSE_FORWARD, NULL},
-       {N_("/Bounce"),                 NULL, summary_reply_cb, COMPOSE_BOUNCE, NULL},
+       {N_("/Redirect"),               NULL, summary_reply_cb, COMPOSE_REDIRECT, NULL},
        {N_("/---"),                    NULL, NULL,             0, "<Separator>"},
        {N_("/Re-_edit"),               NULL, summary_reedit,   0, NULL},
        {N_("/---"),                    NULL, NULL,             0, "<Separator>"},
@@ -1097,7 +1097,7 @@ static void summary_set_menu_sensitive(SummaryView *summaryview)
        menu_set_sensitive(ifactory, "/Reply to sender",          sens);
        menu_set_sensitive(ifactory, "/Reply to all",             sens);
        menu_set_sensitive(ifactory, "/Forward",                  TRUE);
-       menu_set_sensitive(ifactory, "/Bounce",                   TRUE);
+       menu_set_sensitive(ifactory, "/Redirect",                 TRUE);
 
        menu_set_sensitive(ifactory, "/Add sender to address book", sens);
        menu_set_sensitive(ifactory, "/Create filter rule",         sens);
@@ -4229,8 +4229,8 @@ void summary_reply(SummaryView *summaryview, ComposeMode mode)
                        g_slist_free(msginfo_list);
                }                       
                break;
-       case COMPOSE_BOUNCE:
-               compose_bounce(NULL, msginfo);
+       case COMPOSE_REDIRECT:
+               compose_redirect(NULL, msginfo);
                break;
        default:
                g_warning("summary_reply_cb(): invalid action: %d\n", mode);