From 7ade227e6409c98a4010992450e111cf7bb10520 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Thu, 14 Aug 2008 20:19:12 +0000 Subject: Merge revisions 35951:35992 from trunk. svn path=/branches/kill-bonobo/; revision=35994 --- mail/mail-send-recv.c | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) (limited to 'mail/mail-send-recv.c') diff --git a/mail/mail-send-recv.c b/mail/mail-send-recv.c index ab4cc41006..588d1287ae 100644 --- a/mail/mail-send-recv.c +++ b/mail/mail-send-recv.c @@ -46,7 +46,6 @@ #include "mail-send-recv.h" #include "mail-folder-cache.h" #include "em-event.h" -#include #include #define d(x) @@ -379,7 +378,6 @@ build_dialog (EAccountList *accounts, CamelFolder *outbox, const char *destinati char *pretty_url; EAccount *account; EIterator *iter; - GList *icon_list; EMEventTargetSendReceive *target; gd = (GtkDialog *)(send_recv_dialog = gtk_dialog_new_with_buttons(_("Send & Receive Mail"), NULL, GTK_DIALOG_NO_SEPARATOR, NULL)); @@ -401,12 +399,7 @@ build_dialog (EAccountList *accounts, CamelFolder *outbox, const char *destinati gtk_widget_show (cancel_button); gtk_dialog_add_action_widget (gd, cancel_button, GTK_RESPONSE_CANCEL); - icon_list = e_icon_factory_get_icon_list ("mail-send-receive"); - if (icon_list) { - gtk_window_set_icon_list (GTK_WINDOW (gd), icon_list); - g_list_foreach (icon_list, (GFunc) g_object_unref, NULL); - g_list_free (icon_list); - } + gtk_window_set_icon_name (GTK_WINDOW (gd), "mail-send-receive"); num_sources = 0; @@ -487,8 +480,8 @@ build_dialog (EAccountList *accounts, CamelFolder *outbox, const char *destinati } else if (info->timeout_id == 0) info->timeout_id = g_timeout_add (STATUS_TIMEOUT, operation_status_timeout, info); - recv_icon = e_icon_factory_get_image ( - "mail-inbox", E_ICON_SIZE_LARGE_TOOLBAR); + recv_icon = gtk_image_new_from_icon_name ( + "mail-inbox", GTK_ICON_SIZE_LARGE_TOOLBAR); pretty_url = format_url (source->url, account->name); label = gtk_label_new (NULL); gtk_label_set_ellipsize ( @@ -564,8 +557,8 @@ build_dialog (EAccountList *accounts, CamelFolder *outbox, const char *destinati } else if (info->timeout_id == 0) info->timeout_id = g_timeout_add (STATUS_TIMEOUT, operation_status_timeout, info); - send_icon = e_icon_factory_get_image ( - "mail-outbox", E_ICON_SIZE_LARGE_TOOLBAR); + send_icon = gtk_image_new_from_icon_name ( + "mail-outbox", GTK_ICON_SIZE_LARGE_TOOLBAR); pretty_url = format_url (destination, NULL); label = gtk_label_new (NULL); gtk_label_set_ellipsize ( -- cgit From c0a255eb90769638d57ae4122932f75c46e4e531 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Thu, 11 Sep 2008 15:34:29 +0000 Subject: Merge revisions 36016:36303 from trunk. svn path=/branches/kill-bonobo/; revision=36307 --- mail/mail-send-recv.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'mail/mail-send-recv.c') diff --git a/mail/mail-send-recv.c b/mail/mail-send-recv.c index 588d1287ae..139bc2dc25 100644 --- a/mail/mail-send-recv.c +++ b/mail/mail-send-recv.c @@ -1061,7 +1061,7 @@ auto_online(CamelObject *o, void *ed, void *d) /* call to setup initial, and after changes are made to the config */ /* FIXME: Need a cleanup funciton for when object is deactivated */ void -mail_autoreceive_init(void) +mail_autoreceive_init (CamelSession *session) { EAccountList *accounts; EIterator *iter; @@ -1079,7 +1079,7 @@ mail_autoreceive_init(void) for (iter = e_list_get_iterator((EList *)accounts);e_iterator_is_valid(iter);e_iterator_next(iter)) auto_account_added(accounts, (EAccount *)e_iterator_get(iter), NULL); - camel_object_hook_event(mail_component_peek_session(NULL), "online", auto_online, NULL); + camel_object_hook_event (session, "online", auto_online, NULL); } /* we setup the download info's in a hashtable, if we later need to build the gui, we insert -- cgit From b2cda1d0c6d44f53f71bad9e256f41188677dfba Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Wed, 1 Oct 2008 20:56:04 +0000 Subject: Merge revisions 36016:36533 from trunk. svn path=/branches/kill-bonobo/; revision=36534 --- mail/mail-send-recv.c | 33 +++++++++++++++++++-------------- 1 file changed, 19 insertions(+), 14 deletions(-) (limited to 'mail/mail-send-recv.c') diff --git a/mail/mail-send-recv.c b/mail/mail-send-recv.c index 139bc2dc25..29cbb57322 100644 --- a/mail/mail-send-recv.c +++ b/mail/mail-send-recv.c @@ -1,22 +1,22 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ /* - * Authors: Michael Zucchi - * - * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) - * * This program is free software; you can redistribute it and/or - * modify it under the terms of version 2 of the GNU General Public - * License as published by the Free Software Foundation. + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) version 3. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with the program; if not, see * - * You should have received a copy of the GNU General Public - * License along with this program; if not, write to the - * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. + * + * Authors: + * Michael Zucchi + * + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) * */ @@ -415,6 +415,10 @@ build_dialog (EAccountList *accounts, CamelFolder *outbox, const char *destinati g_object_unref (iter); + /* Check to see if we have to send any mails --- if we don't, don't display the SMTP row in the table */ + if (outbox && destination && camel_folder_get_message_count (outbox) == 0) + num_sources--; + table = gtk_table_new (num_sources, 4, FALSE); gtk_container_set_border_width (GTK_CONTAINER (table), 6); gtk_table_set_row_spacings (GTK_TABLE (table), 6); @@ -539,7 +543,8 @@ build_dialog (EAccountList *accounts, CamelFolder *outbox, const char *destinati target = em_event_target_new_send_receive (em_event_peek(), table, data, row, EM_EVENT_SEND_RECEIVE); e_event_emit ((EEvent *)em_event_peek (), "mail.sendreceive", (EEventTarget *) target); - if (outbox && destination) { + /* Skip displaying the SMTP row if we've got no outbox, destination or unsent mails */ + if (outbox && destination && camel_folder_get_message_count (outbox) != 0) { info = g_hash_table_lookup (data->active, SEND_URI_KEY); if (info == NULL) { info = g_malloc0 (sizeof (*info)); @@ -601,9 +606,9 @@ build_dialog (EAccountList *accounts, CamelFolder *outbox, const char *destinati g_signal_connect ( cancel_button, "clicked", G_CALLBACK (receive_cancel), info); - gtk_widget_show_all (table); } + gtk_widget_show_all (table); gtk_widget_show (GTK_WIDGET (gd)); g_signal_connect (gd, "response", G_CALLBACK (dialog_response), data); -- cgit From 54b80a7271e8ce1b2f3ccc68bb553940a24b80e2 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Fri, 17 Oct 2008 03:48:03 +0000 Subject: Get the mail folder tree compiling, though I'm not yet sure why it's not showing anything. Probably something stupid. Also enabled the composer. svn path=/branches/kill-bonobo/; revision=36623 --- mail/mail-send-recv.c | 24 +++++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-) (limited to 'mail/mail-send-recv.c') diff --git a/mail/mail-send-recv.c b/mail/mail-send-recv.c index 29cbb57322..9894ec2fa5 100644 --- a/mail/mail-send-recv.c +++ b/mail/mail-send-recv.c @@ -38,7 +38,6 @@ #include "camel/camel-store.h" #include "mail-mt.h" -#include "mail-component.h" #include "mail-config.h" #include "mail-session.h" #include "mail-tools.h" @@ -48,6 +47,8 @@ #include "em-event.h" #include +#include "e-mail-shell-module.h" + #define d(x) /* ms between status updates to the gui */ @@ -160,7 +161,8 @@ setup_send_data(void) g_str_hash, g_str_equal, (GDestroyNotify) NULL, (GDestroyNotify) free_folder_info); - data->inbox = mail_component_get_folder(NULL, MAIL_COMPONENT_FOLDER_LOCAL_INBOX); + data->inbox = e_mail_shell_module_get_folder ( + mail_shell_module, E_MAIL_FOLDER_LOCAL_INBOX); camel_object_ref(data->inbox); data->active = g_hash_table_new_full ( g_str_hash, g_str_equal, @@ -677,8 +679,13 @@ receive_done (char *uri, void *data) /* if we've been called to run again - run again */ if (info->type == SEND_SEND && info->state == SEND_ACTIVE && info->again) { + CamelFolder *local_outbox_folder; + + local_outbox_folder = e_mail_shell_module_get_folder ( + mail_shell_module, E_MAIL_FOLDER_OUTBOX); + info->again = 0; - mail_send_queue (mail_component_get_folder(NULL, MAIL_COMPONENT_FOLDER_OUTBOX), + mail_send_queue (local_outbox_folder, info->uri, FILTER_SOURCE_OUTGOING, info->cancel, @@ -890,7 +897,7 @@ receive_update_got_store (char *uri, CamelStore *store, void *data) struct _send_info *info = data; if (store) { - mail_note_store(store, info->cancel, receive_update_got_folderinfo, info); + mail_note_store(mail_shell_module, store, info->cancel, receive_update_got_folderinfo, info); } else { receive_done("", info); } @@ -922,7 +929,8 @@ mail_send_receive (void) accounts = mail_config_get_accounts (); - outbox_folder = mail_component_get_folder(NULL, MAIL_COMPONENT_FOLDER_OUTBOX); + outbox_folder = e_mail_shell_module_get_folder ( + mail_shell_module, E_MAIL_FOLDER_OUTBOX); data = build_dialog (accounts, outbox_folder, account->transport->url); scan = data->infos; while (scan) { @@ -1139,7 +1147,8 @@ mail_receive_uri (const char *uri, int keep) break; case SEND_SEND: /* todo, store the folder in info? */ - outbox_folder = mail_component_get_folder(NULL, MAIL_COMPONENT_FOLDER_OUTBOX); + outbox_folder = e_mail_shell_module_get_folder ( + mail_shell_module, E_MAIL_FOLDER_OUTBOX); mail_send_queue (outbox_folder, info->uri, FILTER_SOURCE_OUTGOING, info->cancel, @@ -1201,7 +1210,8 @@ mail_send (void) g_hash_table_insert (data->active, SEND_URI_KEY, info); /* todo, store the folder in info? */ - outbox_folder = mail_component_get_folder(NULL, MAIL_COMPONENT_FOLDER_OUTBOX); + outbox_folder = e_mail_shell_module_get_folder ( + mail_shell_module, E_MAIL_FOLDER_OUTBOX); mail_send_queue (outbox_folder, info->uri, FILTER_SOURCE_OUTGOING, info->cancel, -- cgit From 85b2913a380c69f14ae0254ad23b10fabfb33667 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Fri, 24 Oct 2008 23:52:05 +0000 Subject: Merge revisions 36534:36684 from trunk. svn path=/branches/kill-bonobo/; revision=36685 --- mail/mail-send-recv.c | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) (limited to 'mail/mail-send-recv.c') diff --git a/mail/mail-send-recv.c b/mail/mail-send-recv.c index 9894ec2fa5..87948fdf53 100644 --- a/mail/mail-send-recv.c +++ b/mail/mail-send-recv.c @@ -106,7 +106,7 @@ struct _send_info { send_info_t type; /* 0 = fetch, 1 = send */ CamelOperation *cancel; char *uri; - int keep; + gboolean keep_on_server; send_state_t state; GtkWidget *progress_bar; GtkWidget *cancel_button; @@ -472,7 +472,7 @@ build_dialog (EAccountList *accounts, CamelFolder *outbox, const char *destinati d(printf("adding source %s\n", source->url)); info->uri = g_strdup (source->url); - info->keep = source->keep_on_server; + info->keep_on_server = source->keep_on_server; info->cancel = camel_operation_new (operation_status, info); info->state = SEND_ACTIVE; info->timeout_id = g_timeout_add (STATUS_TIMEOUT, operation_status_timeout, info); @@ -554,7 +554,7 @@ build_dialog (EAccountList *accounts, CamelFolder *outbox, const char *destinati d(printf("adding dest %s\n", destination)); info->uri = g_strdup (destination); - info->keep = FALSE; + info->keep_on_server = FALSE; info->cancel = camel_operation_new (operation_status, info); info->state = SEND_ACTIVE; info->timeout_id = g_timeout_add (STATUS_TIMEOUT, operation_status_timeout, info); @@ -938,7 +938,7 @@ mail_send_receive (void) switch(info->type) { case SEND_RECEIVE: - mail_fetch_mail(info->uri, info->keep, + mail_fetch_mail(info->uri, info->keep_on_server, FILTER_SOURCE_INCOMING, info->cancel, receive_get_folder, info, @@ -979,11 +979,15 @@ auto_timeout(void *data) { struct _auto_data *info = data; - if (camel_session_is_online(session)) { - const char *uri = e_account_get_string(info->account, E_ACCOUNT_SOURCE_URL); - int keep = e_account_get_bool(info->account, E_ACCOUNT_SOURCE_KEEP_ON_SERVER); + if (camel_session_is_online (session)) { + const gchar *uri; + gboolean keep_on_server; - mail_receive_uri(uri, keep); + uri = e_account_get_string ( + info->account, E_ACCOUNT_SOURCE_URL); + keep_on_server = e_account_get_bool ( + info->account, E_ACCOUNT_SOURCE_KEEP_ON_SERVER); + mail_receive_uri (uri, keep_on_server); } return TRUE; @@ -1098,7 +1102,7 @@ mail_autoreceive_init (CamelSession *session) /* we setup the download info's in a hashtable, if we later need to build the gui, we insert them in to add them. */ void -mail_receive_uri (const char *uri, int keep) +mail_receive_uri (const gchar *uri, gboolean keep_on_server) { struct _send_info *info; struct _send_data *data; @@ -1125,7 +1129,7 @@ mail_receive_uri (const char *uri, int keep) info->progress_bar = NULL; info->status_label = NULL; info->uri = g_strdup (uri); - info->keep = keep; + info->keep_on_server = keep_on_server; info->cancel = camel_operation_new (operation_status, info); info->cancel_button = NULL; info->data = data; @@ -1138,7 +1142,7 @@ mail_receive_uri (const char *uri, int keep) switch (info->type) { case SEND_RECEIVE: - mail_fetch_mail (info->uri, info->keep, + mail_fetch_mail (info->uri, info->keep_on_server, FILTER_SOURCE_INCOMING, info->cancel, receive_get_folder, info, @@ -1198,7 +1202,7 @@ mail_send (void) info->progress_bar = NULL; info->status_label = NULL; info->uri = g_strdup (transport->url); - info->keep = FALSE; + info->keep_on_server = FALSE; info->cancel = NULL; info->cancel_button = NULL; info->data = data; -- cgit From b7333387e8bd19299794e6485e3407d03c2eb73f Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Sun, 14 Dec 2008 02:14:41 +0000 Subject: - Fix NetworkManager connection tracking. - Implement offline preparation as an EActivity that gets broadcast in a signal to shell modules. Offline preparations are complete when the last EActivity reference is dropped. - Bind some of the composer preferences to EShellSettings properties. svn path=/branches/kill-bonobo/; revision=36875 --- mail/mail-send-recv.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) (limited to 'mail/mail-send-recv.c') diff --git a/mail/mail-send-recv.c b/mail/mail-send-recv.c index 87948fdf53..70b69f0c97 100644 --- a/mail/mail-send-recv.c +++ b/mail/mail-send-recv.c @@ -362,7 +362,10 @@ get_receive_type(const char *url) } static struct _send_data * -build_dialog (EAccountList *accounts, CamelFolder *outbox, const char *destination) +build_dialog (GtkWindow *parent, + EAccountList *accounts, + CamelFolder *outbox, + const gchar *destination) { GtkDialog *gd; GtkWidget *table; @@ -382,7 +385,10 @@ build_dialog (EAccountList *accounts, CamelFolder *outbox, const char *destinati EIterator *iter; EMEventTargetSendReceive *target; - gd = (GtkDialog *)(send_recv_dialog = gtk_dialog_new_with_buttons(_("Send & Receive Mail"), NULL, GTK_DIALOG_NO_SEPARATOR, NULL)); + send_recv_dialog = gtk_dialog_new_with_buttons ( + _("Send & Receive Mail"), parent, + GTK_DIALOG_NO_SEPARATOR, NULL); + gd = GTK_DIALOG (send_recv_dialog); gtk_window_set_modal ((GtkWindow *) gd, FALSE); gconf_bridge_bind_window_size ( @@ -904,7 +910,7 @@ receive_update_got_store (char *uri, CamelStore *store, void *data) } GtkWidget * -mail_send_receive (void) +mail_send_receive (GtkWindow *parent) { CamelFolder *outbox_folder; struct _send_data *data; @@ -931,7 +937,8 @@ mail_send_receive (void) outbox_folder = e_mail_shell_module_get_folder ( mail_shell_module, E_MAIL_FOLDER_OUTBOX); - data = build_dialog (accounts, outbox_folder, account->transport->url); + data = build_dialog ( + parent, accounts, outbox_folder, account->transport->url); scan = data->infos; while (scan) { struct _send_info *info = scan->data; -- cgit From c7d3c9f95609123035ebaa267f9d2e6ecfa8c2e8 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Mon, 12 Jan 2009 04:12:01 +0000 Subject: Merge revisions 36866:37046 from trunk. svn path=/branches/kill-bonobo/; revision=37050 --- mail/mail-send-recv.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'mail/mail-send-recv.c') diff --git a/mail/mail-send-recv.c b/mail/mail-send-recv.c index 70b69f0c97..1a8fb02017 100644 --- a/mail/mail-send-recv.c +++ b/mail/mail-send-recv.c @@ -424,7 +424,8 @@ build_dialog (GtkWindow *parent, g_object_unref (iter); /* Check to see if we have to send any mails --- if we don't, don't display the SMTP row in the table */ - if (outbox && destination && camel_folder_get_message_count (outbox) == 0) + if (outbox && destination + && (camel_folder_get_message_count(outbox) - camel_folder_get_deleted_message_count(outbox)) == 0) num_sources--; table = gtk_table_new (num_sources, 4, FALSE); @@ -552,7 +553,8 @@ build_dialog (GtkWindow *parent, e_event_emit ((EEvent *)em_event_peek (), "mail.sendreceive", (EEventTarget *) target); /* Skip displaying the SMTP row if we've got no outbox, destination or unsent mails */ - if (outbox && destination && camel_folder_get_message_count (outbox) != 0) { + if (outbox && destination + && (camel_folder_get_message_count(outbox) - camel_folder_get_deleted_message_count(outbox)) != 0) { info = g_hash_table_lookup (data->active, SEND_URI_KEY); if (info == NULL) { info = g_malloc0 (sizeof (*info)); -- cgit From e0f414941dd4e13ea074996d10606b0dae7e494b Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Mon, 26 Jan 2009 22:18:58 +0000 Subject: Split EAccountList and ESignatureList management out of the mail module. This reduces the dependency of the composer on the mail module, which is currently a circular dependency. svn path=/branches/kill-bonobo/; revision=37135 --- mail/mail-send-recv.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'mail/mail-send-recv.c') diff --git a/mail/mail-send-recv.c b/mail/mail-send-recv.c index 1a8fb02017..6e2ace004b 100644 --- a/mail/mail-send-recv.c +++ b/mail/mail-send-recv.c @@ -45,7 +45,9 @@ #include "mail-send-recv.h" #include "mail-folder-cache.h" #include "em-event.h" -#include + +#include "e-util/e-account-utils.h" +#include "e-util/gconf-bridge.h" #include "e-mail-shell-module.h" @@ -931,11 +933,11 @@ mail_send_receive (GtkWindow *parent) if (!camel_session_is_online (session)) return send_recv_dialog; - account = mail_config_get_default_account (); + account = e_get_default_account (); if (!account || !account->transport->url) return send_recv_dialog; - accounts = mail_config_get_accounts (); + accounts = e_get_account_list (); outbox_folder = e_mail_shell_module_get_folder ( mail_shell_module, E_MAIL_FOLDER_OUTBOX); @@ -1076,7 +1078,7 @@ auto_online(CamelObject *o, void *ed, void *d) if (!GPOINTER_TO_INT(ed)) return; - accounts = mail_config_get_accounts (); + accounts = e_get_account_list (); for (iter = e_list_get_iterator((EList *)accounts);e_iterator_is_valid(iter);e_iterator_next(iter)) { info = g_object_get_data((GObject *)e_iterator_get(iter), "mail-autoreceive"); if (info && info->timeout_id) @@ -1095,7 +1097,7 @@ mail_autoreceive_init (CamelSession *session) if (auto_active) return; - accounts = mail_config_get_accounts (); + accounts = e_get_account_list (); auto_active = g_hash_table_new(g_str_hash, g_str_equal); g_signal_connect(accounts, "account-added", G_CALLBACK(auto_account_added), NULL); -- cgit From 9b73ae5c7d2c016a3b1f07b1040355063b32814b Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Thu, 23 Apr 2009 16:48:05 -0400 Subject: Miscellaneous bug fixes. --- mail/mail-send-recv.c | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) (limited to 'mail/mail-send-recv.c') diff --git a/mail/mail-send-recv.c b/mail/mail-send-recv.c index 6e2ace004b..9fe40a5fbc 100644 --- a/mail/mail-send-recv.c +++ b/mail/mail-send-recv.c @@ -46,6 +46,7 @@ #include "mail-folder-cache.h" #include "em-event.h" +#include "shell/e-shell.h" #include "e-util/e-account-utils.h" #include "e-util/gconf-bridge.h" @@ -1069,13 +1070,13 @@ auto_account_changed(EAccountList *eal, EAccount *ea, void *dummy) } static void -auto_online(CamelObject *o, void *ed, void *d) +auto_online (EShell *shell) { EIterator *iter; EAccountList *accounts; struct _auto_data *info; - if (!GPOINTER_TO_INT(ed)) + if (!e_shell_get_online (shell)) return; accounts = e_get_account_list (); @@ -1089,10 +1090,15 @@ auto_online(CamelObject *o, void *ed, void *d) /* call to setup initial, and after changes are made to the config */ /* FIXME: Need a cleanup funciton for when object is deactivated */ void -mail_autoreceive_init (CamelSession *session) +mail_autoreceive_init (EShellModule *shell_module, + CamelSession *session) { EAccountList *accounts; EIterator *iter; + EShell *shell; + + g_return_if_fail (E_IS_SHELL_MODULE (shell_module)); + g_return_if_fail (CAMEL_IS_SESSION (session)); if (auto_active) return; @@ -1107,7 +1113,13 @@ mail_autoreceive_init (CamelSession *session) for (iter = e_list_get_iterator((EList *)accounts);e_iterator_is_valid(iter);e_iterator_next(iter)) auto_account_added(accounts, (EAccount *)e_iterator_get(iter), NULL); - camel_object_hook_event (session, "online", auto_online, NULL); + shell = e_shell_module_get_shell (shell_module); + + auto_online (shell); + + g_signal_connect ( + shell, "notify::online", + G_CALLBACK (auto_online), NULL); } /* we setup the download info's in a hashtable, if we later need to build the gui, we insert -- cgit From 16e2beab9e4d412399f495f6165d27da80cb3675 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Thu, 7 May 2009 16:38:32 -0400 Subject: Adapt mail to EShellBackend changes. Again, builds but not tested. Lots of compiler warnings to clean up, but I don't have the energy for it. This was pretty grueling. --- mail/mail-send-recv.c | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) (limited to 'mail/mail-send-recv.c') diff --git a/mail/mail-send-recv.c b/mail/mail-send-recv.c index 3ffc9b46a6..7b6326338e 100644 --- a/mail/mail-send-recv.c +++ b/mail/mail-send-recv.c @@ -50,7 +50,7 @@ #include "e-util/e-account-utils.h" #include "e-util/gconf-bridge.h" -#include "e-mail-shell-module.h" +#include "e-mail-shell-backend.h" #define d(x) @@ -164,8 +164,8 @@ setup_send_data(void) g_str_hash, g_str_equal, (GDestroyNotify) NULL, (GDestroyNotify) free_folder_info); - data->inbox = e_mail_shell_module_get_folder ( - mail_shell_module, E_MAIL_FOLDER_LOCAL_INBOX); + data->inbox = e_mail_shell_backend_get_folder ( + global_mail_shell_backend, E_MAIL_FOLDER_LOCAL_INBOX); camel_object_ref(data->inbox); data->active = g_hash_table_new_full ( g_str_hash, g_str_equal, @@ -692,8 +692,8 @@ receive_done (char *uri, void *data) if (info->type == SEND_SEND && info->state == SEND_ACTIVE && info->again) { CamelFolder *local_outbox_folder; - local_outbox_folder = e_mail_shell_module_get_folder ( - mail_shell_module, E_MAIL_FOLDER_OUTBOX); + local_outbox_folder = e_mail_shell_backend_get_folder ( + global_mail_shell_backend, E_MAIL_FOLDER_OUTBOX); info->again = 0; mail_send_queue (local_outbox_folder, @@ -908,7 +908,7 @@ receive_update_got_store (char *uri, CamelStore *store, void *data) struct _send_info *info = data; if (store) { - mail_note_store(mail_shell_module, store, info->cancel, receive_update_got_folderinfo, info); + mail_note_store(global_mail_shell_backend, store, info->cancel, receive_update_got_folderinfo, info); } else { receive_done("", info); } @@ -940,8 +940,8 @@ mail_send_receive (GtkWindow *parent) accounts = e_get_account_list (); - outbox_folder = e_mail_shell_module_get_folder ( - mail_shell_module, E_MAIL_FOLDER_OUTBOX); + outbox_folder = e_mail_shell_backend_get_folder ( + global_mail_shell_backend, E_MAIL_FOLDER_OUTBOX); data = build_dialog ( parent, accounts, outbox_folder, account->transport->url); scan = data->infos; @@ -1090,14 +1090,14 @@ auto_online (EShell *shell) /* call to setup initial, and after changes are made to the config */ /* FIXME: Need a cleanup funciton for when object is deactivated */ void -mail_autoreceive_init (EShellModule *shell_module, +mail_autoreceive_init (EShellBackend *shell_backend, CamelSession *session) { EAccountList *accounts; EIterator *iter; EShell *shell; - g_return_if_fail (E_IS_SHELL_MODULE (shell_module)); + g_return_if_fail (E_IS_SHELL_BACKEND (shell_backend)); g_return_if_fail (CAMEL_IS_SESSION (session)); if (auto_active) @@ -1113,7 +1113,7 @@ mail_autoreceive_init (EShellModule *shell_module, for (iter = e_list_get_iterator((EList *)accounts);e_iterator_is_valid(iter);e_iterator_next(iter)) auto_account_added(accounts, (EAccount *)e_iterator_get(iter), NULL); - shell = e_shell_module_get_shell (shell_module); + shell = e_shell_backend_get_shell (shell_backend); auto_online (shell); @@ -1174,8 +1174,8 @@ mail_receive_uri (const gchar *uri, gboolean keep_on_server) break; case SEND_SEND: /* todo, store the folder in info? */ - outbox_folder = e_mail_shell_module_get_folder ( - mail_shell_module, E_MAIL_FOLDER_OUTBOX); + outbox_folder = e_mail_shell_backend_get_folder ( + global_mail_shell_backend, E_MAIL_FOLDER_OUTBOX); mail_send_queue (outbox_folder, info->uri, FILTER_SOURCE_OUTGOING, info->cancel, @@ -1237,8 +1237,8 @@ mail_send (void) g_hash_table_insert (data->active, SEND_URI_KEY, info); /* todo, store the folder in info? */ - outbox_folder = e_mail_shell_module_get_folder ( - mail_shell_module, E_MAIL_FOLDER_OUTBOX); + outbox_folder = e_mail_shell_backend_get_folder ( + global_mail_shell_backend, E_MAIL_FOLDER_OUTBOX); mail_send_queue (outbox_folder, info->uri, FILTER_SOURCE_OUTGOING, info->cancel, -- cgit From e4afd3f9fb962ea1295a0657ec9f83a427829171 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Tue, 26 May 2009 23:21:02 -0400 Subject: Remove trailing whitespace, again. --- mail/mail-send-recv.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'mail/mail-send-recv.c') diff --git a/mail/mail-send-recv.c b/mail/mail-send-recv.c index 655f1dbf72..be834bb0d3 100644 --- a/mail/mail-send-recv.c +++ b/mail/mail-send-recv.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: @@ -416,7 +416,7 @@ build_dialog (EAccountList *accounts, CamelFolder *outbox, const char *destinati g_object_unref (iter); /* Check to see if we have to send any mails --- if we don't, don't display the SMTP row in the table */ - if (outbox && destination + if (outbox && destination && (camel_folder_get_message_count(outbox) - camel_folder_get_deleted_message_count(outbox)) == 0) num_sources--; @@ -545,7 +545,7 @@ build_dialog (EAccountList *accounts, CamelFolder *outbox, const char *destinati e_event_emit ((EEvent *)em_event_peek (), "mail.sendreceive", (EEventTarget *) target); /* Skip displaying the SMTP row if we've got no outbox, destination or unsent mails */ - if (outbox && destination + if (outbox && destination && (camel_folder_get_message_count(outbox) - camel_folder_get_deleted_message_count(outbox)) != 0) { info = g_hash_table_lookup (data->active, SEND_URI_KEY); if (info == NULL) { @@ -1196,7 +1196,7 @@ mail_send (void) info->status_label = NULL; info->uri = g_strdup (transport->url); info->keep_on_server = FALSE; - info->cancel = NULL; + info->cancel = NULL; info->cancel_button = NULL; info->data = data; info->state = SEND_ACTIVE; -- cgit From 948235c3d1076dbe6ed2e57a24c16a083bbd9f01 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Wed, 27 May 2009 10:29:19 -0400 Subject: Prefer GLib basic types over C types. --- mail/mail-send-recv.c | 72 +++++++++++++++++++++++++-------------------------- 1 file changed, 36 insertions(+), 36 deletions(-) (limited to 'mail/mail-send-recv.c') diff --git a/mail/mail-send-recv.c b/mail/mail-send-recv.c index a463bb835b..95f3ca53e2 100644 --- a/mail/mail-send-recv.c +++ b/mail/mail-send-recv.c @@ -71,17 +71,17 @@ /* this stuff is used to keep track of which folders filters have accessed, and what not. the thaw/refreeze thing doesn't really seem to work though */ struct _folder_info { - char *uri; + gchar *uri; CamelFolder *folder; time_t update; - int count; /* how many times updated, to slow it down as we go, if we have lots */ + gint count; /* how many times updated, to slow it down as we go, if we have lots */ }; struct _send_data { GList *infos; GtkDialog *gd; - int cancelled; + gint cancelled; CamelFolder *inbox; /* since we're never asked to update this one, do it ourselves */ time_t inbox_update; @@ -108,24 +108,24 @@ typedef enum { struct _send_info { send_info_t type; /* 0 = fetch, 1 = send */ CamelOperation *cancel; - char *uri; + gchar *uri; gboolean keep_on_server; send_state_t state; GtkWidget *progress_bar; GtkWidget *cancel_button; GtkWidget *status_label; - int again; /* need to run send again */ + gint again; /* need to run send again */ - int timeout_id; - char *what; - int pc; + gint timeout_id; + gchar *what; + gint pc; /*time_t update;*/ struct _send_data *data; }; -static CamelFolder *receive_get_folder(CamelFilterDriver *d, const char *uri, void *data, CamelException *ex); +static CamelFolder *receive_get_folder(CamelFilterDriver *d, const gchar *uri, gpointer data, CamelException *ex); static struct _send_data *send_data = NULL; static GtkWidget *send_recv_dialog = NULL; @@ -212,13 +212,13 @@ free_send_data(void) } static void -cancel_send_info(void *key, struct _send_info *info, void *data) +cancel_send_info(gpointer key, struct _send_info *info, gpointer data) { receive_cancel (GTK_BUTTON (info->cancel_button), info); } static void -hide_send_info(void *key, struct _send_info *info, void *data) +hide_send_info(gpointer key, struct _send_info *info, gpointer data) { info->cancel_button = NULL; info->progress_bar = NULL; @@ -239,7 +239,7 @@ dialog_destroy_cb (struct _send_data *data, GObject *deadbeef) } static void -dialog_response(GtkDialog *gd, int button, struct _send_data *data) +dialog_response(GtkDialog *gd, gint button, struct _send_data *data) { switch(button) { case GTK_RESPONSE_CANCEL: @@ -260,7 +260,7 @@ dialog_response(GtkDialog *gd, int button, struct _send_data *data) } static int -operation_status_timeout(void *data) +operation_status_timeout(gpointer data) { struct _send_info *info = data; @@ -279,7 +279,7 @@ operation_status_timeout(void *data) } static void -set_send_status(struct _send_info *info, const char *desc, int pc) +set_send_status(struct _send_info *info, const gchar *desc, gint pc) { /* FIXME: LOCK */ g_free(info->what); @@ -289,7 +289,7 @@ set_send_status(struct _send_info *info, const char *desc, int pc) /* for camel operation status */ static void -operation_status(CamelOperation *op, const char *what, int pc, void *data) +operation_status(CamelOperation *op, const gchar *what, gint pc, gpointer data) { struct _send_info *info = data; @@ -306,11 +306,11 @@ operation_status(CamelOperation *op, const char *what, int pc, void *data) set_send_status(info, what, pc); } -static char * -format_url(const char *internal_url, const char *account_name) +static gchar * +format_url(const gchar *internal_url, const gchar *account_name) { CamelURL *url; - char *pretty_url; + gchar *pretty_url; url = camel_url_new(internal_url, NULL); if (account_name) { @@ -335,7 +335,7 @@ format_url(const char *internal_url, const char *account_name) } static send_info_t -get_receive_type(const char *url) +get_receive_type(const gchar *url) { CamelProvider *provider; CamelException ex; @@ -372,7 +372,7 @@ build_dialog (GtkWindow *parent, { GtkDialog *gd; GtkWidget *table; - int row, num_sources; + gint row, num_sources; GList *list = NULL; struct _send_data *data; GtkWidget *send_icon; @@ -383,7 +383,7 @@ build_dialog (GtkWindow *parent, GtkWidget *progress_bar; GtkWidget *cancel_button; struct _send_info *info; - char *pretty_url; + gchar *pretty_url; EAccount *account; EIterator *iter; EMEventTargetSendReceive *target; @@ -634,7 +634,7 @@ build_dialog (GtkWindow *parent, } static void -update_folders(char *uri, struct _folder_info *info, void *data) +update_folders(gchar *uri, struct _folder_info *info, gpointer data) { time_t now = *((time_t *)data); @@ -652,7 +652,7 @@ update_folders(char *uri, struct _folder_info *info, void *data) } static void -receive_status (CamelFilterDriver *driver, enum camel_filter_status_t status, int pc, const char *desc, void *data) +receive_status (CamelFilterDriver *driver, enum camel_filter_status_t status, gint pc, const gchar *desc, gpointer data) { struct _send_info *info = data; time_t now = time(NULL); @@ -684,7 +684,7 @@ receive_status (CamelFilterDriver *driver, enum camel_filter_status_t status, in /* when receive/send is complete */ static void -receive_done (const gchar *uri, void *data) +receive_done (const gchar *uri, gpointer data) { struct _send_info *info = data; @@ -747,7 +747,7 @@ receive_done (const gchar *uri, void *data) This can also be used to hook into which folders are being updated, and occasionally let them refresh */ static CamelFolder * -receive_get_folder(CamelFilterDriver *d, const char *uri, void *data, CamelException *ex) +receive_get_folder(CamelFilterDriver *d, const gchar *uri, gpointer data, CamelException *ex) { struct _send_info *info = data; CamelFolder *folder; @@ -825,7 +825,7 @@ refresh_folders_desc (struct _refresh_folders_msg *m) static void refresh_folders_exec (struct _refresh_folders_msg *m) { - int i; + gint i; CamelFolder *folder; CamelException ex = CAMEL_EXCEPTION_INITIALISER; @@ -858,7 +858,7 @@ refresh_folders_done (struct _refresh_folders_msg *m) static void refresh_folders_free (struct _refresh_folders_msg *m) { - int i; + gint i; for (i=0;ifolders->len;i++) g_free(m->folders->pdata[i]); @@ -877,7 +877,7 @@ static MailMsgInfo refresh_folders_info = { }; static gboolean -receive_update_got_folderinfo(CamelStore *store, CamelFolderInfo *info, void *data) +receive_update_got_folderinfo(CamelStore *store, CamelFolderInfo *info, gpointer data) { if (info) { GPtrArray *folders = g_ptr_array_new(); @@ -903,7 +903,7 @@ receive_update_got_folderinfo(CamelStore *store, CamelFolderInfo *info, void *da } static void -receive_update_got_store (char *uri, CamelStore *store, void *data) +receive_update_got_store (gchar *uri, CamelStore *store, gpointer data) { struct _send_info *info = data; @@ -980,14 +980,14 @@ mail_send_receive (GtkWindow *parent) struct _auto_data { EAccount *account; - int period; /* in seconds */ - int timeout_id; + gint period; /* in seconds */ + gint timeout_id; }; static GHashTable *auto_active; static gboolean -auto_timeout(void *data) +auto_timeout(gpointer data) { struct _auto_data *info = data; @@ -1006,7 +1006,7 @@ auto_timeout(void *data) } static void -auto_account_removed(EAccountList *eal, EAccount *ea, void *dummy) +auto_account_removed(EAccountList *eal, EAccount *ea, gpointer dummy) { struct _auto_data *info = g_object_get_data((GObject *)ea, "mail-autoreceive"); @@ -1029,7 +1029,7 @@ auto_account_finalised(struct _auto_data *info) static void auto_account_commit(struct _auto_data *info) { - int period, check; + gint period, check; check = info->account->enabled && e_account_get_bool(info->account, E_ACCOUNT_SOURCE_AUTO_CHECK) @@ -1049,7 +1049,7 @@ auto_account_commit(struct _auto_data *info) } static void -auto_account_added(EAccountList *eal, EAccount *ea, void *dummy) +auto_account_added(EAccountList *eal, EAccount *ea, gpointer dummy) { struct _auto_data *info; @@ -1060,7 +1060,7 @@ auto_account_added(EAccountList *eal, EAccount *ea, void *dummy) } static void -auto_account_changed(EAccountList *eal, EAccount *ea, void *dummy) +auto_account_changed(EAccountList *eal, EAccount *ea, gpointer dummy) { struct _auto_data *info = g_object_get_data((GObject *)ea, "mail-autoreceive"); -- cgit From 14f8eee012382f04090ea9277e9567d5f32e8bf0 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Thu, 28 May 2009 13:06:29 -0400 Subject: Whitespace cleanup. --- mail/mail-send-recv.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'mail/mail-send-recv.c') diff --git a/mail/mail-send-recv.c b/mail/mail-send-recv.c index 95f3ca53e2..aa1f1afec0 100644 --- a/mail/mail-send-recv.c +++ b/mail/mail-send-recv.c @@ -310,7 +310,7 @@ static gchar * format_url(const gchar *internal_url, const gchar *account_name) { CamelURL *url; - gchar *pretty_url; + gchar *pretty_url; url = camel_url_new(internal_url, NULL); if (account_name) { @@ -498,7 +498,7 @@ build_dialog (GtkWindow *parent, recv_icon = gtk_image_new_from_icon_name ( "mail-inbox", GTK_ICON_SIZE_LARGE_TOOLBAR); - pretty_url = format_url (source->url, account->name); + pretty_url = format_url (source->url, account->name); label = gtk_label_new (NULL); gtk_label_set_ellipsize ( GTK_LABEL (label), PANGO_ELLIPSIZE_END); @@ -519,7 +519,7 @@ build_dialog (GtkWindow *parent, gtk_misc_set_alignment (GTK_MISC (label), 0, .5); gtk_misc_set_alignment (GTK_MISC (status_label), 0, .5); - gtk_table_attach ( + gtk_table_attach ( GTK_TABLE (table), recv_icon, 0, 1, row, row+2, 0, 0, 0, 0); gtk_table_attach ( -- cgit From 433eac7844481b8ceda0bae8bf08f6bb623185b0 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Mon, 1 Jun 2009 19:09:19 -0400 Subject: More code cleanup. --- mail/mail-send-recv.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'mail/mail-send-recv.c') diff --git a/mail/mail-send-recv.c b/mail/mail-send-recv.c index aa1f1afec0..03775c74d1 100644 --- a/mail/mail-send-recv.c +++ b/mail/mail-send-recv.c @@ -97,7 +97,7 @@ typedef enum { SEND_SEND, /* sender */ SEND_UPDATE, /* imap-like 'just update folder info' */ SEND_INVALID -} send_info_t ; +} send_info_t; typedef enum { SEND_ACTIVE, @@ -259,7 +259,7 @@ dialog_response(GtkDialog *gd, gint button, struct _send_data *data) } } -static int +static gint operation_status_timeout(gpointer data) { struct _send_info *info = data; -- cgit From 174c942e0945a2017f0c479883dce2950e42e786 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Wed, 24 Jun 2009 00:40:49 -0400 Subject: Split store and local folder management out from shell backend. --- mail/mail-send-recv.c | 39 +++++++++++++++++++-------------------- 1 file changed, 19 insertions(+), 20 deletions(-) (limited to 'mail/mail-send-recv.c') diff --git a/mail/mail-send-recv.c b/mail/mail-send-recv.c index 03775c74d1..2f9cd77de6 100644 --- a/mail/mail-send-recv.c +++ b/mail/mail-send-recv.c @@ -50,6 +50,7 @@ #include "e-util/e-account-utils.h" #include "e-util/gconf-bridge.h" +#include "e-mail-local.h" #include "e-mail-shell-backend.h" #define d(x) @@ -164,8 +165,8 @@ setup_send_data(void) g_str_hash, g_str_equal, (GDestroyNotify) NULL, (GDestroyNotify) free_folder_info); - data->inbox = e_mail_shell_backend_get_folder ( - global_mail_shell_backend, E_MAIL_FOLDER_LOCAL_INBOX); + data->inbox = e_mail_local_get_folder ( + E_MAIL_FOLDER_LOCAL_INBOX); camel_object_ref(data->inbox); data->active = g_hash_table_new_full ( g_str_hash, g_str_equal, @@ -690,13 +691,12 @@ receive_done (const gchar *uri, gpointer data) /* if we've been called to run again - run again */ if (info->type == SEND_SEND && info->state == SEND_ACTIVE && info->again) { - CamelFolder *local_outbox_folder; + CamelFolder *local_outbox; - local_outbox_folder = e_mail_shell_backend_get_folder ( - global_mail_shell_backend, E_MAIL_FOLDER_OUTBOX); + local_outbox = e_mail_local_get_folder (E_MAIL_FOLDER_OUTBOX); info->again = 0; - mail_send_queue (local_outbox_folder, + mail_send_queue (local_outbox, info->uri, FILTER_SOURCE_OUTGOING, info->cancel, @@ -908,7 +908,9 @@ receive_update_got_store (gchar *uri, CamelStore *store, gpointer data) struct _send_info *info = data; if (store) { - mail_note_store(global_mail_shell_backend, store, info->cancel, receive_update_got_folderinfo, info); + mail_note_store( + store, info->cancel, + receive_update_got_folderinfo, info); } else { receive_done("", info); } @@ -917,7 +919,7 @@ receive_update_got_store (gchar *uri, CamelStore *store, gpointer data) GtkWidget * mail_send_receive (GtkWindow *parent) { - CamelFolder *outbox_folder; + CamelFolder *local_outbox; struct _send_data *data; EAccountList *accounts; EAccount *account; @@ -940,10 +942,9 @@ mail_send_receive (GtkWindow *parent) accounts = e_get_account_list (); - outbox_folder = e_mail_shell_backend_get_folder ( - global_mail_shell_backend, E_MAIL_FOLDER_OUTBOX); + local_outbox = e_mail_local_get_folder (E_MAIL_FOLDER_OUTBOX); data = build_dialog ( - parent, accounts, outbox_folder, account->transport->url); + parent, accounts, local_outbox, account->transport->url); scan = data->infos; while (scan) { struct _send_info *info = scan->data; @@ -959,7 +960,7 @@ mail_send_receive (GtkWindow *parent) break; case SEND_SEND: /* todo, store the folder in info? */ - mail_send_queue(outbox_folder, info->uri, + mail_send_queue(local_outbox, info->uri, FILTER_SOURCE_OUTGOING, info->cancel, receive_get_folder, info, @@ -1129,7 +1130,7 @@ mail_receive_uri (const gchar *uri, gboolean keep_on_server) { struct _send_info *info; struct _send_data *data; - CamelFolder *outbox_folder; + CamelFolder *local_outbox; send_info_t type; data = setup_send_data(); @@ -1174,9 +1175,8 @@ mail_receive_uri (const gchar *uri, gboolean keep_on_server) break; case SEND_SEND: /* todo, store the folder in info? */ - outbox_folder = e_mail_shell_backend_get_folder ( - global_mail_shell_backend, E_MAIL_FOLDER_OUTBOX); - mail_send_queue (outbox_folder, info->uri, + local_outbox = e_mail_local_get_folder (E_MAIL_FOLDER_OUTBOX); + mail_send_queue (local_outbox, info->uri, FILTER_SOURCE_OUTGOING, info->cancel, receive_get_folder, info, @@ -1194,7 +1194,7 @@ mail_receive_uri (const gchar *uri, gboolean keep_on_server) void mail_send (void) { - CamelFolder *outbox_folder; + CamelFolder *local_outbox; EAccountService *transport; struct _send_info *info; struct _send_data *data; @@ -1237,9 +1237,8 @@ mail_send (void) g_hash_table_insert (data->active, (gpointer) SEND_URI_KEY, info); /* todo, store the folder in info? */ - outbox_folder = e_mail_shell_backend_get_folder ( - global_mail_shell_backend, E_MAIL_FOLDER_OUTBOX); - mail_send_queue (outbox_folder, info->uri, + local_outbox = e_mail_local_get_folder (E_MAIL_FOLDER_OUTBOX); + mail_send_queue (local_outbox, info->uri, FILTER_SOURCE_OUTGOING, info->cancel, receive_get_folder, info, -- cgit From f0d3f3afdfa314e1e8cd7d8da790878008a46aad Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Wed, 24 Jun 2009 12:59:33 -0400 Subject: Radically reorganize source code. - Collect all shell modules into a new top-level 'modules' directory: $(top_srcdir)/modules/addressbook $(top_srcdir)/modules/calendar $(top_srcdir)/modules/mail Nothing is allowed to link to these, not plugins nor other modules. THIS SOLVES BUG #571275 AND OPENS THE DOOR TO PORTING TO MAC OS X. - Mimic the libevolution-mail-shared library from master (except drop the "shared" suffix) and have libevolution-mail-importers and all mail-related plugins link to it. - Discard the a11y subdirectories and have the files live alongside their counterpart widgets. --- mail/mail-send-recv.c | 1 - 1 file changed, 1 deletion(-) (limited to 'mail/mail-send-recv.c') diff --git a/mail/mail-send-recv.c b/mail/mail-send-recv.c index 2f9cd77de6..9cc75057fa 100644 --- a/mail/mail-send-recv.c +++ b/mail/mail-send-recv.c @@ -51,7 +51,6 @@ #include "e-util/gconf-bridge.h" #include "e-mail-local.h" -#include "e-mail-shell-backend.h" #define d(x) -- cgit From fa360fde289f9b850191f89059d1a5e6d67c07c7 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Sat, 18 Jul 2009 14:07:42 -0400 Subject: More whitespace cleanup. --- mail/mail-send-recv.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'mail/mail-send-recv.c') diff --git a/mail/mail-send-recv.c b/mail/mail-send-recv.c index 323d21f4d7..39fc67e614 100644 --- a/mail/mail-send-recv.c +++ b/mail/mail-send-recv.c @@ -241,7 +241,7 @@ dialog_destroy_cb (struct _send_data *data, GObject *deadbeef) static void dialog_response(GtkDialog *gd, gint button, struct _send_data *data) { - switch(button) { + switch (button) { case GTK_RESPONSE_CANCEL: d(printf("cancelled whole thing\n")); if (!data->cancelled) { @@ -955,7 +955,7 @@ mail_send_receive (GtkWindow *parent) while (scan) { struct _send_info *info = scan->data; - switch(info->type) { + switch (info->type) { case SEND_RECEIVE: mail_fetch_mail(info->uri, info->keep_on_server, FILTER_SOURCE_INCOMING, -- cgit