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-factory.c | |
| parent | f02973aaf4ee15e818981301e62b10ea1d225a53 (diff) | |
| download | gsoc2013-evolution-b9401bbdf43b51b3596498d12ba2d73e2cca1805.tar.gz 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-factory.c')
| -rw-r--r-- | mail/folder-browser-factory.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/mail/folder-browser-factory.c b/mail/folder-browser-factory.c index ac0970319b..64a91eeacc 100644 --- a/mail/folder-browser-factory.c +++ b/mail/folder-browser-factory.c @@ -70,8 +70,9 @@ BonoboUIVerb verbs [] = { BONOBO_UI_UNSAFE_VERB ("MessagePrint", print_msg), BONOBO_UI_UNSAFE_VERB ("MessageReplySender", reply_to_sender), BONOBO_UI_UNSAFE_VERB ("MessageReplyAll", reply_to_all), + BONOBO_UI_UNSAFE_VERB ("MessageForward", forward), BONOBO_UI_UNSAFE_VERB ("MessageForwardAttached", forward_attached), - BONOBO_UI_UNSAFE_VERB ("MessageForwardInlined", forward_inlined), + BONOBO_UI_UNSAFE_VERB ("MessageForwardInline", forward_inline), BONOBO_UI_UNSAFE_VERB ("MessageForwardQuoted", forward_quoted), BONOBO_UI_UNSAFE_VERB ("MessageMarkAsRead", mark_as_seen), @@ -136,7 +137,7 @@ static EPixmap pixcache [] = { E_PIXMAP ("/menu/Actions/Component/MessageMove", "move_message.xpm"), E_PIXMAP ("/menu/Actions/Component/MessageReplyAll", "reply_to_all.xpm"), E_PIXMAP ("/menu/Actions/Component/MessageReplySender", "reply.xpm"), - E_PIXMAP ("/menu/Actions/Component/MessageForwardAttached", "forward.xpm"), + E_PIXMAP ("/menu/Actions/Component/MessageForward", "forward.xpm"), E_PIXMAP ("/menu/Tools/Component/SetMailConfig", "configure_16_mail.xpm"), |