aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--mail/ChangeLog8
-rw-r--r--mail/folder-browser-factory.c2
-rw-r--r--mail/mail-ops.c14
-rw-r--r--mail/mail.h2
4 files changed, 17 insertions, 9 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index a79e1145ff..aa6b7d1088 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,11 @@
+2000-07-26 Jeffrey Stedfast <fejj@helixcode.com>
+
+ * mail-ops.c: s/struct refile_data/struct move_data
+ (real_move_msg): Renamed from real_refile_msg()
+ (move_msg): Renamed from refile_msg()
+
+ * folder-browser-factory.c: Changed Refile to Move.
+
2000-07-26 Dan Winship <danw@helixcode.com>
* mail-format.c (lookup_handler): Update for OAF and for external
diff --git a/mail/folder-browser-factory.c b/mail/folder-browser-factory.c
index 089e83059d..a941e6286e 100644
--- a/mail/folder-browser-factory.c
+++ b/mail/folder-browser-factory.c
@@ -32,7 +32,7 @@ static GnomeUIInfo gnome_toolbar [] = {
GNOMEUIINFO_SEPARATOR,
- GNOMEUIINFO_ITEM_STOCK (N_("Refile"), N_("Move message to a new folder"), refile_msg, GNOME_STOCK_PIXMAP_MAIL_SND),
+ GNOMEUIINFO_ITEM_STOCK (N_("Move"), N_("Move message to a new folder"), move_msg, GNOME_STOCK_PIXMAP_MAIL_SND),
GNOMEUIINFO_ITEM_STOCK (N_("Print"), N_("Print the selected message"), print_msg, GNOME_STOCK_PIXMAP_PRINT),
diff --git a/mail/mail-ops.c b/mail/mail-ops.c
index 9602d8dcd6..3ffe34854f 100644
--- a/mail/mail-ops.c
+++ b/mail/mail-ops.c
@@ -739,15 +739,15 @@ forward_msg (GtkWidget *button, gpointer user_data)
gtk_widget_show (GTK_WIDGET (composer));
}
-struct refile_data {
+struct move_data {
CamelFolder *source, *dest;
CamelException *ex;
};
static void
-real_refile_msg (MessageList *ml, const char *uid, gpointer user_data)
+real_move_msg (MessageList *ml, const char *uid, gpointer user_data)
{
- struct refile_data *rfd = user_data;
+ struct move_data *rfd = user_data;
if (camel_exception_is_set (rfd->ex))
return;
@@ -756,12 +756,12 @@ real_refile_msg (MessageList *ml, const char *uid, gpointer user_data)
}
void
-refile_msg (GtkWidget *button, gpointer user_data)
+move_msg (GtkWidget *button, gpointer user_data)
{
FolderBrowser *fb = user_data;
MessageList *ml = fb->message_list;
char *uri, *physical, *path;
- struct refile_data rfd;
+ struct move_data rfd;
const char *allowed_types[] = { "mail", NULL };
extern EvolutionShellClient *global_shell_client;
@@ -771,7 +771,7 @@ refile_msg (GtkWidget *button, gpointer user_data)
last = g_strdup ("");
evolution_shell_client_user_select_folder (global_shell_client,
- _("Refile message(s) to"),
+ _("Move message(s) to"),
last, allowed_types, &uri, &physical);
if (!uri)
return;
@@ -790,7 +790,7 @@ refile_msg (GtkWidget *button, gpointer user_data)
return;
rfd.ex = camel_exception_new ();
- message_list_foreach (ml, real_refile_msg, &rfd);
+ message_list_foreach (ml, real_move_msg, &rfd);
gtk_object_unref (GTK_OBJECT (rfd.dest));
if (camel_exception_is_set (rfd.ex))
diff --git a/mail/mail.h b/mail/mail.h
index 788bb579bf..0c447f62d6 100644
--- a/mail/mail.h
+++ b/mail/mail.h
@@ -53,7 +53,7 @@ void forward_msg (GtkWidget *button, gpointer user_data);
void reply_to_sender (GtkWidget *button, gpointer user_data);
void reply_to_all (GtkWidget *button, gpointer user_data);
void delete_msg (GtkWidget *button, gpointer user_data);
-void refile_msg (GtkWidget *button, gpointer user_data);
+void move_msg (GtkWidget *button, gpointer user_data);
void print_msg (GtkWidget *button, gpointer user_data);
void expunge_folder (BonoboUIHandler *uih, void *user_data, const char *path);