diff options
Diffstat (limited to 'mail')
| -rw-r--r-- | mail/ChangeLog | 9 | ||||
| -rw-r--r-- | mail/folder-browser.c | 4 | ||||
| -rw-r--r-- | mail/mail-callbacks.c | 16 | ||||
| -rw-r--r-- | mail/mail-callbacks.h | 6 |
4 files changed, 29 insertions, 6 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog index 77258c61d5..34736defd1 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,3 +1,12 @@ +2001-10-21 Jeffrey Stedfast <fejj@ximian.com> + + * folder-browser.c: Call the new move/copy_msg_cb's + + * mail-callbacks.c (move_msg_cb): Renamed from move_msg. + (copy_msg_cb): Renamed from copy_msg. + (move_msg): The bonobo-ui-component callback. + (copy_msg): Same. + 2001-10-21 <NotZed@Ximian.com> * mail-vfolder.c (mail_vfolder_shutdown): Clear variables once diff --git a/mail/folder-browser.c b/mail/folder-browser.c index f5deb31499..6c5b6f57ed 100644 --- a/mail/folder-browser.c +++ b/mail/folder-browser.c @@ -1444,8 +1444,8 @@ static EPopupMenu context_menu[] = { E_POPUP_SEPARATOR, - { N_("_Move to Folder..."), NULL, GTK_SIGNAL_FUNC (move_msg), NULL, 0 }, - { N_("_Copy to Folder..."), NULL, GTK_SIGNAL_FUNC (copy_msg), NULL, 0 }, + { N_("_Move to Folder..."), NULL, GTK_SIGNAL_FUNC (move_msg_cb), NULL, 0 }, + { N_("_Copy to Folder..."), NULL, GTK_SIGNAL_FUNC (copy_msg_cb), NULL, 0 }, { N_("_Delete"), NULL, GTK_SIGNAL_FUNC (delete_msg), NULL, CAN_DELETE }, { N_("_Undelete"), NULL, GTK_SIGNAL_FUNC (undelete_msg), NULL, CAN_UNDELETE }, diff --git a/mail/mail-callbacks.c b/mail/mail-callbacks.c index e92d62f180..9fccdd051d 100644 --- a/mail/mail-callbacks.c +++ b/mail/mail-callbacks.c @@ -1262,17 +1262,29 @@ transfer_msg (GtkWidget *widget, gpointer user_data, gboolean delete_from_source } void -move_msg (GtkWidget *widget, gpointer user_data) +move_msg_cb (GtkWidget *widget, gpointer user_data) { transfer_msg (widget, user_data, TRUE); } void -copy_msg (GtkWidget *widget, gpointer user_data) +move_msg (BonoboUIComponent *uih, void *user_data, const char *path) +{ + transfer_msg (GTK_WIDGET (user_data), NULL, TRUE); +} + +void +copy_msg_cb (GtkWidget *widget, gpointer user_data) { transfer_msg (widget, user_data, FALSE); } +void +copy_msg (BonoboUIComponent *uih, void *user_data, const char *path) +{ + transfer_msg (GTK_WIDGET (user_data), NULL, FALSE); +} + /* Copied from e-shell-view.c */ static GtkWidget * find_socket (GtkContainer *container) diff --git a/mail/mail-callbacks.h b/mail/mail-callbacks.h index 0eeb8ff247..3421bfaf54 100644 --- a/mail/mail-callbacks.h +++ b/mail/mail-callbacks.h @@ -60,8 +60,8 @@ void reply_to_all (GtkWidget *widget, gpointer user_data); void delete_msg (GtkWidget *widget, gpointer user_data); void undelete_msg (GtkWidget *widget, gpointer user_data); -void move_msg (GtkWidget *widget, gpointer user_data); -void copy_msg (GtkWidget *widget, gpointer user_data); +void move_msg_cb (GtkWidget *widget, gpointer user_data); +void copy_msg_cb (GtkWidget *widget, gpointer user_data); void addrbook_sender (GtkWidget *widget, gpointer user_data); void apply_filters (GtkWidget *widget, gpointer user_data); void print_msg (GtkWidget *widget, gpointer user_data); @@ -81,6 +81,8 @@ void resend_msg (GtkWidget *widget, gpointer user_data); void search_msg (GtkWidget *widget, gpointer user_data); void load_images (GtkWidget *widget, gpointer user_data); +void move_msg (BonoboUIComponent *uih, void *user_data, const char *path); +void copy_msg (BonoboUIComponent *uih, void *user_data, const char *path); void select_all (BonoboUIComponent *uih, void *user_data, const char *path); void select_thread (BonoboUIComponent *uih, void *user_data, const char *path); void invert_selection (BonoboUIComponent *uih, void *user_data, const char *path); |