aboutsummaryrefslogtreecommitdiffstats
path: root/mail/mail-send-recv.c
diff options
context:
space:
mode:
authorEttore Perazzoli <ettore@src.gnome.org>2002-03-21 08:07:49 +0800
committerEttore Perazzoli <ettore@src.gnome.org>2002-03-21 08:07:49 +0800
commit364cb04c2b58a371d45a6645dbca8d9f069fba2e (patch)
tree8d74d92fcdf15bfd111f357f7dfc1213556f5355 /mail/mail-send-recv.c
parent9eeff8bfec181a1710b62926c64d617cce766054 (diff)
downloadgsoc2013-evolution-364cb04c2b58a371d45a6645dbca8d9f069fba2e.tar.gz
gsoc2013-evolution-364cb04c2b58a371d45a6645dbca8d9f069fba2e.tar.zst
gsoc2013-evolution-364cb04c2b58a371d45a6645dbca8d9f069fba2e.zip
Move the ComponentActionsPlaceholder into the Actions menu, instead of the
* evolution.xml: Move the ComponentActionsPlaceholder into the Actions menu, instead of the Actions menu being in the ComponentActionsPlaceholder. * evolution-addressbook.xml: Updated accordingly. * evolution-calendar.xml: Updated accordingly. * evolution-mail-global.xml: Updated accordingly. * evolution-mail-list.xml: Updated accordingly. * evolution-mail-message.xml: Updated accordingly. * evolution-mail-messagedisplay.xml: Updated accordingly. * evolution-tasks.xml: Updated accordingly. * evolution.xml: Add "SendReceive" verb, menu item and toolbar button. * evolution-mail-global.xml: Remove "MailGetSend" verb and menu item. * e-shell-view-menu.c (command_send_receive): New, implementation for the "SendReceive" verb. * e-shell.c (e_shell_send_receive): New. * evolution-shell-component.c (impl_sendReceive): Implementation of ShellComponent::sendReceive. (class_init): Add the "send_receive" signal. * evolution-shell-component.h: Added `send_receive' signal. * Evolution-ShellComponent.idl: Added ShellComponent::sendReceive. * component-factory.c (send_receive_cb): New, callback for the "send_receive" signal on the EvolutionShellComponent. (create_component): Connect. * folder-browser-ui.c: Remove verb "MailGetSend". * mail-callbacks.c (send_receive_mail): Removed. * mail-send-recv.c: Remove member current_folder from struct _send_data. (free_send_data): No need to unref here. (build_dialogue): Removed arg @current_folder. (mail_send_receive): Likewise. svn path=/trunk/; revision=16220
Diffstat (limited to 'mail/mail-send-recv.c')
-rw-r--r--mail/mail-send-recv.c15
1 files changed, 4 insertions, 11 deletions
diff --git a/mail/mail-send-recv.c b/mail/mail-send-recv.c
index 3017203e6e..816efa4841 100644
--- a/mail/mail-send-recv.c
+++ b/mail/mail-send-recv.c
@@ -78,8 +78,6 @@ struct _send_data {
CamelFolder *inbox; /* since we're never asked to update this one, do it ourselves */
time_t inbox_update;
- CamelFolder *current_folder;
-
GMutex *lock;
GHashTable *folders;
@@ -179,10 +177,7 @@ free_send_data(void)
/*camel_folder_thaw (data->inbox); */
camel_object_unref((CamelObject *)data->inbox);
}
- if (data->current_folder) {
- mail_refresh_folder(data->current_folder, NULL, NULL);
- camel_object_unref((CamelObject *)data->current_folder);
- }
+
g_list_free(data->infos);
g_hash_table_foreach(data->active, (GHFunc)free_send_info, NULL);
g_hash_table_destroy(data->active);
@@ -274,7 +269,7 @@ static send_info_t get_receive_type(const char *url)
}
static struct _send_data *
-build_dialogue (GSList *sources, CamelFolder *current_folder, CamelFolder *outbox, const char *destination)
+build_dialogue (GSList *sources, CamelFolder *outbox, const char *destination)
{
GnomeDialog *gd;
GtkTable *table;
@@ -433,8 +428,6 @@ build_dialogue (GSList *sources, CamelFolder *current_folder, CamelFolder *outbo
data->infos = list;
data->gd = gd;
- data->current_folder = current_folder;
- camel_object_ref (CAMEL_OBJECT (current_folder));
return data;
}
@@ -647,7 +640,7 @@ receive_update_got_store (char *uri, CamelStore *store, void *data)
}
}
-void mail_send_receive (CamelFolder *current_folder)
+void mail_send_receive (void)
{
GSList *sources;
GList *scan;
@@ -674,7 +667,7 @@ void mail_send_receive (CamelFolder *current_folder)
Well, probably hook into receive_done or receive_status on
the right pop account, and when it is, then kick off the
smtp one. */
- data = build_dialogue(sources, current_folder, outbox_folder, account->transport->url);
+ data = build_dialogue(sources, outbox_folder, account->transport->url);
scan = data->infos;
while (scan) {
struct _send_info *info = scan->data;