callisto-debian/evolution
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed bug #13151

Browse Source 
svn path=/trunk/; revision=13858
This commit is contained in:
Jeffrey Stedfast
2001-10-21 23:19:44 +00:00
parent 1ef615979f
commit 6b011476f6
4 changed files with 29 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
mail/ChangeLog
View File

@ -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

4
mail/folder-browser.c
View File

@ -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 },

16
mail/mail-callbacks.c
View File

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

6
mail/mail-callbacks.h
View File

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