From 7ffad86d872af64e2d2925b1652248506b5197c4 Mon Sep 17 00:00:00 2001 From: Jeffrey Stedfast Date: Mon, 29 Oct 2001 03:11:56 +0000 Subject: Call mail_autoreceive_setup() instead of mail_autoreceive_setup_account() 2001-10-28 Jeffrey Stedfast * mail-account-gui.c (mail_account_gui_save): Call mail_autoreceive_setup() instead of mail_autoreceive_setup_account() since that code was completely broken anyway. * mail-send-recv.c (mail_autoreceive_setup_account): Removed. svn path=/trunk/; revision=14318 --- mail/ChangeLog | 7 +++++++ mail/mail-account-gui.c | 2 +- mail/mail-send-recv.c | 29 +++++++---------------------- mail/mail-send-recv.h | 1 - 4 files changed, 15 insertions(+), 24 deletions(-) diff --git a/mail/ChangeLog b/mail/ChangeLog index ef8330367d..6844a1a362 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,5 +1,12 @@ 2001-10-28 Jeffrey Stedfast + * mail-account-gui.c (mail_account_gui_save): Call + mail_autoreceive_setup() instead of + mail_autoreceive_setup_account() since that code was completely + broken anyway. + + * mail-send-recv.c (mail_autoreceive_setup_account): Removed. + * mail-callbacks.c (transfer_msg_done): Move the message-list cursor to the next message. (transfer_msg): If we are moving messages, then pass diff --git a/mail/mail-account-gui.c b/mail/mail-account-gui.c index 42eff0d5b9..ef16de0ba3 100644 --- a/mail/mail-account-gui.c +++ b/mail/mail-account-gui.c @@ -1717,7 +1717,7 @@ mail_account_gui_save (MailAccountGui *gui) if (gtk_toggle_button_get_active (gui->default_account)) mail_config_set_default_account (account); - mail_autoreceive_setup_account (account->source); + mail_autoreceive_setup (); return TRUE; } diff --git a/mail/mail-send-recv.c b/mail/mail-send-recv.c index 674873099c..be5b13f248 100644 --- a/mail/mail-send-recv.c +++ b/mail/mail-send-recv.c @@ -723,11 +723,14 @@ static void auto_clean_set(void *key, struct _auto_data *info, GHashTable *set) /* call to setup initial, and after changes are made to the config */ /* FIXME: Need a cleanup funciton for when object is deactivated */ -static void -autoreceive_setup_list(GSList *sources, gboolean clear_absent) +void +mail_autoreceive_setup (void) { GHashTable *set_hash; - + GSList *sources; + + sources = mail_config_get_sources(); + if (!sources) return; @@ -769,28 +772,10 @@ autoreceive_setup_list(GSList *sources, gboolean clear_absent) sources = sources->next; } - if (clear_absent) - g_hash_table_foreach(set_hash, (GHFunc)auto_clean_set, auto_active); + g_hash_table_foreach(set_hash, (GHFunc)auto_clean_set, auto_active); g_hash_table_destroy(set_hash); } -void -mail_autoreceive_setup (void) -{ - autoreceive_setup_list (mail_config_get_sources(), TRUE); -} - -void -mail_autoreceive_setup_account (MailConfigService *service) -{ - GSList list; - - list.data = service; - list.next = NULL; - - autoreceive_setup_list (&list, FALSE); -} - /* 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 diff --git a/mail/mail-send-recv.h b/mail/mail-send-recv.h index 687cbd1448..7d43d610fb 100644 --- a/mail/mail-send-recv.h +++ b/mail/mail-send-recv.h @@ -36,7 +36,6 @@ void mail_send_receive(void); void mail_receive_uri(const char *uri, int keep); /* setup auto receive stuff */ void mail_autoreceive_setup(void); -void mail_autoreceive_setup_account(MailConfigService *source); #ifdef __cplusplus } -- cgit v1.2.3