diff options
| author | Dan Winship <danw@src.gnome.org> | 2001-05-15 01:18:03 +0800 |
|---|---|---|
| committer | Dan Winship <danw@src.gnome.org> | 2001-05-15 01:18:03 +0800 |
| commit | b9401bbdf43b51b3596498d12ba2d73e2cca1805 (patch) | |
| tree | 82d72a137b851efbfde70064f9d7fb3e6b81f6e7 /mail/folder-browser.c | |
| parent | f02973aaf4ee15e818981301e62b10ea1d225a53 (diff) | |
| download | gsoc2013-evolution-b9401bbdf43b51b3596498d12ba2d73e2cca1805.tar gsoc2013-evolution-b9401bbdf43b51b3596498d12ba2d73e2cca1805.tar.gz gsoc2013-evolution-b9401bbdf43b51b3596498d12ba2d73e2cca1805.tar.bz2 gsoc2013-evolution-b9401bbdf43b51b3596498d12ba2d73e2cca1805.tar.lz gsoc2013-evolution-b9401bbdf43b51b3596498d12ba2d73e2cca1805.tar.xz gsoc2013-evolution-b9401bbdf43b51b3596498d12ba2d73e2cca1805.tar.zst gsoc2013-evolution-b9401bbdf43b51b3596498d12ba2d73e2cca1805.zip | |
Split "Other" page into three pages, Display, Composer, and PGP. Add HTML
* mail-config.glade: Split "Other" page into three pages, Display,
Composer, and PGP. Add HTML image stuff on the Display page and
default forward style on the Composer page.
* mail-config.c (mail_config_get_default_forward_style,
mail_config_set_default_forward_style): User-specified default
style for forwarding messages.
(config_read, mail_config_write_on_exit): Deal with forward style.
* mail-accounts.c: Handle HTML image display options and default
forward style.
* mail-callbacks.c (forward): New. Forward in the user-selected
default style.
(forward_inline, forward_quoted): Simplify these some. Remove the
fallback to forward attached when forwarding multiple messages: it
should just forward the multiple messages inline or quoted in
those cases. (Which it doesn't yet, but that's a bug.)
* folder-browser.c (context_menu): Remove "Forward inline" and
make "Forward" call forward() rather than forward_attached().
* folder-browser-factory.c: Update command/menu/toolbar/pixmap
gunk for the "MessageForwardAttached" vs "MessageForward" split.
* mail-session.c (mail_session_get_type):
* mail-format.c (format_mime_part):
* mail-account-gui.c (setup_service): Fix warnings.
svn path=/trunk/; revision=9792
Diffstat (limited to 'mail/folder-browser.c')
| -rw-r--r-- | mail/folder-browser.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/mail/folder-browser.c b/mail/folder-browser.c index 2d904dab22..bf99655f3b 100644 --- a/mail/folder-browser.c +++ b/mail/folder-browser.c @@ -634,9 +634,7 @@ static EPopupMenu context_menu[] = { { N_("Reply to _All"), NULL, GTK_SIGNAL_FUNC (reply_to_all), NULL, 0 }, { N_("_Forward"), NULL, - GTK_SIGNAL_FUNC (forward_attached), NULL, 0 }, - { N_("Forward _inline"), NULL, - GTK_SIGNAL_FUNC (forward_inlined), NULL, 0 }, + GTK_SIGNAL_FUNC (forward), NULL, 0 }, { "", NULL, (NULL), NULL, 0 }, { N_("Mar_k as Read"), NULL, GTK_SIGNAL_FUNC (mark_as_seen), NULL, CAN_MARK_READ }, |