diff options
| -rw-r--r-- | mail/ChangeLog | 13 | ||||
| -rw-r--r-- | mail/folder-browser-factory.c | 4 | ||||
| -rw-r--r-- | mail/folder-browser.c | 4 | ||||
| -rw-r--r-- | mail/mail-callbacks.c | 4 | ||||
| -rw-r--r-- | mail/mail-callbacks.h | 4 | ||||
| -rw-r--r-- | ui/ChangeLog | 8 | ||||
| -rw-r--r-- | ui/evolution-mail.xml | 8 |
7 files changed, 33 insertions, 12 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog index 172bdd6ca4..86e6a8c3e7 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,3 +1,16 @@ +2000-12-04 Ettore Perazzoli <ettore@helixcode.com> + + * folder-browser-factory.c: Updated to define verbs + "MessageForwardInlined" and "MessageForwardAttached" instead of + "MessageForwardInline" and "MessageForwardAttach". + + * folder-browser.c (on_right_click): Make forwarding as an + attachment the default. + + * mail-callbacks.c (forward_inlined): Renamed from `forward_msg'. + (forward_attached): Renamed from `forward_attach'. + * mail-callbacks.h: Updated accordingly. + 2000-12-01 Dan Winship <danw@helixcode.com> * session.c (mail_session_remember_password): Writes out passwords diff --git a/mail/folder-browser-factory.c b/mail/folder-browser-factory.c index d24c56e10e..0095ded338 100644 --- a/mail/folder-browser-factory.c +++ b/mail/folder-browser-factory.c @@ -58,8 +58,8 @@ BonoboUIVerb verbs [] = { BONOBO_UI_UNSAFE_VERB ("MessagePrint", print_msg), BONOBO_UI_UNSAFE_VERB ("MessageReplySndr", reply_to_sender), BONOBO_UI_UNSAFE_VERB ("MessageReplyAll", reply_to_all), - BONOBO_UI_UNSAFE_VERB ("MessageForward", forward_msg), - BONOBO_UI_UNSAFE_VERB ("MessageForwardAttach", forward_attach), + BONOBO_UI_UNSAFE_VERB ("MessageForwardInlined", forward_inlined), + BONOBO_UI_UNSAFE_VERB ("MessageForwardAttached", forward_attached), BONOBO_UI_UNSAFE_VERB ("MessageMarkAsRead", mark_as_seen), BONOBO_UI_UNSAFE_VERB ("MessageMarkAsUnRead", mark_as_unseen), diff --git a/mail/folder-browser.c b/mail/folder-browser.c index 145e5512d2..7707c87874 100644 --- a/mail/folder-browser.c +++ b/mail/folder-browser.c @@ -482,8 +482,8 @@ on_right_click (ETableScrolled *table, gint row, gint col, GdkEvent *event, Fold { "", NULL, GTK_SIGNAL_FUNC (NULL), NULL, 0 }, { _("Reply to Sender"), NULL, GTK_SIGNAL_FUNC (reply_to_sender), NULL, 0 }, { _("Reply to All"), NULL, GTK_SIGNAL_FUNC (reply_to_all), NULL, 0 }, - { _("Forward"), NULL, GTK_SIGNAL_FUNC (forward_msg), NULL, 0 }, - { _("Forward as Attachment"), NULL, GTK_SIGNAL_FUNC (forward_attach), NULL, 0 }, + { _("Forward"), NULL, GTK_SIGNAL_FUNC (forward_attached), NULL, 0 }, + { _("Forward inline"), NULL, GTK_SIGNAL_FUNC (forward_inlined), NULL, 0 }, { "", NULL, GTK_SIGNAL_FUNC (NULL), NULL, 0 }, { _("Mark as Read"), NULL, GTK_SIGNAL_FUNC (mark_as_seen), NULL, 4 }, { _("Mark as Unread"), NULL, GTK_SIGNAL_FUNC (mark_as_unseen), NULL, 8 }, diff --git a/mail/mail-callbacks.c b/mail/mail-callbacks.c index caf62352af..43692ef6b8 100644 --- a/mail/mail-callbacks.c +++ b/mail/mail-callbacks.c @@ -512,13 +512,13 @@ forward_message (FolderBrowser *fb, gboolean attach) } void -forward_msg (GtkWidget *widget, gpointer user_data) +forward_inlined (GtkWidget *widget, gpointer user_data) { forward_message (FOLDER_BROWSER (user_data), FALSE); } void -forward_attach (GtkWidget *widget, gpointer user_data) +forward_attached (GtkWidget *widget, gpointer user_data) { forward_message (FOLDER_BROWSER (user_data), TRUE); } diff --git a/mail/mail-callbacks.h b/mail/mail-callbacks.h index 63becc96db..a94d58fc5c 100644 --- a/mail/mail-callbacks.h +++ b/mail/mail-callbacks.h @@ -41,8 +41,8 @@ void send_receieve_mail (GtkWidget *widget, gpointer user_data); void compose_msg (GtkWidget *widget, gpointer user_data); void send_to_url (const char *url); -void forward_msg (GtkWidget *widget, gpointer user_data); -void forward_attach (GtkWidget *widget, gpointer user_data); +void forward_inlined (GtkWidget *widget, gpointer user_data); +void forward_attached (GtkWidget *widget, gpointer user_data); void reply_to_sender (GtkWidget *widget, gpointer user_data); void reply_to_all (GtkWidget *widget, gpointer user_data); void delete_msg (GtkWidget *widget, gpointer user_data); diff --git a/ui/ChangeLog b/ui/ChangeLog index e0e3697b6a..2df7d9d185 100644 --- a/ui/ChangeLog +++ b/ui/ChangeLog @@ -1,4 +1,12 @@ +2000-12-04 Ettore Perazzoli <ettore@helixcode.com> + + * evolution-mail.xml: Renamed "MessageForward" to + "MessageForwardInlined" and "MessageForwardAttach" to + "MessageForwardAttached". Make the attached forward the default, + and the one advertised on the toolbar as well. + 2000-12-01 Anna Marie Dirks <anna@helixcode.com> + * evolution.xml: Redid all the keyboard shortcuts to comply with GNOME standards. Removed unnecessary shortcuts from less commonly used menu items, changed all references to "alt", etc. diff --git a/ui/evolution-mail.xml b/ui/evolution-mail.xml index cf2c669d36..8ceb17633e 100644 --- a/ui/evolution-mail.xml +++ b/ui/evolution-mail.xml @@ -97,12 +97,12 @@ <menuitem name="MessageReplyAll" verb="" _label="Reply to _All" accel="*Control**Shift*r"/> - <menuitem name="MessageForward" verb="" + <menuitem name="MessageForwardAttached" verb="" _label="_Forward" accel="*Control*j"/> - <menuitem name="MessageForwardAttach" verb="" - _label="Forward as Attachment" + <menuitem name="MessageForwardInlined" verb="" + _label="Forward inline" accel="*Control**Shift*j"/> <menuitem/> @@ -207,7 +207,7 @@ _label="Reply to All" _tip="Reply to all recipients of this message" pixtype="pixbuf"/> - <toolitem name="Forward" verb="MessageForward" + <toolitem name="Forward" verb="MessageForwardInlined" _label="Forward" _tip="Forward this message" pixtype="pixbuf"/> |