2006-12-27 [paul] 2.6.1cvs79

* src/imap_gtk.c
	* src/mh_gtk.c
		Add Copy folder in the folder's contextual
		menu
This commit is contained in:
Colin Leroy 2006-12-27 09:43:16 +00:00
parent beac606042
commit 186c61de73
5 changed files with 17 additions and 3 deletions

View file

@ -1,3 +1,10 @@
2006-12-27 [paul] 2.6.1cvs79
* src/imap_gtk.c
* src/mh_gtk.c
Add Copy folder in the folder's contextual
menu
2006-12-27 [wwp] 2.6.1cvs78
* src/imap.c

View file

@ -2186,3 +2186,4 @@
( cvs diff -u -r 1.213.2.127 -r 1.213.2.128 src/folder.c; cvs diff -u -r 1.207.2.139 -r 1.207.2.140 src/folderview.c; cvs diff -u -r 1.179.2.142 -r 1.179.2.143 src/imap.c; cvs diff -u -r 1.5.2.12 -r 1.5.2.13 src/statusbar.c; cvs diff -u -r 1.1.4.60 -r 1.1.4.61 src/etpan/imap-thread.c; ) > 2.6.1cvs76.patchset
( cvs diff -u -r 1.5.2.13 -r 1.5.2.14 src/statusbar.c; ) > 2.6.1cvs77.patchset
( cvs diff -u -r 1.179.2.143 -r 1.179.2.144 src/imap.c; ) > 2.6.1cvs78.patchset
( cvs diff -u -r 1.1.2.33 -r 1.1.2.34 src/imap_gtk.c; cvs diff -u -r 1.2.2.23 -r 1.2.2.24 src/mh_gtk.c; ) > 2.6.1cvs79.patchset

View file

@ -11,7 +11,7 @@ MINOR_VERSION=6
MICRO_VERSION=1
INTERFACE_AGE=0
BINARY_AGE=0
EXTRA_VERSION=78
EXTRA_VERSION=79
EXTRA_RELEASE=
EXTRA_GTK2_VERSION=

View file

@ -53,8 +53,11 @@ static void sync_cb(FolderView *folderview, guint action, GtkWidget *widget);
static GtkItemFactoryEntry imap_popup_entries[] =
{
{N_("/Create _new folder..."), NULL, new_folder_cb, 0, NULL},
{"/---", NULL, NULL, 0, "<Separator>"},
{N_("/_Rename folder..."), NULL, rename_folder_cb, 0, NULL},
{N_("/M_ove folder..."), NULL, move_folder_cb, 0, NULL},
{N_("/Cop_y folder..."), NULL, move_folder_cb, 1, NULL},
{"/---", NULL, NULL, 0, "<Separator>"},
{N_("/_Delete folder..."), NULL, delete_folder_cb, 0, NULL},
{"/---", NULL, NULL, 0, "<Separator>"},
{N_("/Synchronise"), NULL, sync_cb, 0, NULL},
@ -254,7 +257,7 @@ static void move_folder_cb(FolderView *folderview, guint action, GtkWidget *widg
if (!to_folder)
return;
folderview_move_folder(folderview, from_folder, to_folder, FALSE);
folderview_move_folder(folderview, from_folder, to_folder, action);
}
static void delete_folder_cb(FolderView *folderview, guint action,

View file

@ -48,8 +48,11 @@ static void remove_mailbox_cb(FolderView *folderview, guint action, GtkWidget *w
static GtkItemFactoryEntry mh_popup_entries[] =
{
{N_("/Create _new folder..."), NULL, new_folder_cb, 0, NULL},
{"/---", NULL, NULL, 0, "<Separator>"},
{N_("/_Rename folder..."), NULL, rename_folder_cb, 0, NULL},
{N_("/M_ove folder..."), NULL, move_folder_cb, 0, NULL},
{N_("/Cop_y folder..."), NULL, move_folder_cb, 1, NULL},
{"/---", NULL, NULL, 0, "<Separator>"},
{N_("/_Delete folder..."), NULL, delete_folder_cb, 0, NULL},
{"/---", NULL, NULL, 0, "<Separator>"},
{N_("/_Check for new messages"), NULL, update_tree_cb, 0, NULL},
@ -282,7 +285,7 @@ static void move_folder_cb(FolderView *folderview, guint action, GtkWidget *widg
if (!to_folder)
return;
folderview_move_folder(folderview, from_folder, to_folder, FALSE);
folderview_move_folder(folderview, from_folder, to_folder, action);
}
static void update_tree_cb(FolderView *folderview, guint action,