diff options
| -rw-r--r-- | mail/ChangeLog | 13 | ||||
| -rw-r--r-- | mail/mail-config.glade | 2 | ||||
| -rw-r--r-- | mail/mail-ops.c | 2 | ||||
| -rw-r--r-- | mail/mail-send-recv.c | 4 |
4 files changed, 17 insertions, 4 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog index 0716c34fcd..0f2d5faf5a 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,3 +1,13 @@ +2004-05-20 Not Zed <NotZed@Ximian.com> + + ** See #58693. + + * mail-send-recv.c (mail_autoreceive_setup): add bounds checking + so sloppy ui work wont break it again. + + * mail-config.glade: put the minimum for autocheck back to 1 + minute. Naughty jeff. + 2004-05-19 Chris Toshok <toshok@ximian.com> * importers/pine-importer.c (import_contacts): use the new @@ -21,6 +31,9 @@ 2004-05-19 Not Zed <NotZed@Ximian.com> + * mail-ops.c (send_queue_send): set seen when we set deleted. ? + #56549. + * em-inline-filter.c (emif_add_part): if we end up with an application/octet-stream part, pre-snoop it so we set the right mime type to start with. Fixes #58554. diff --git a/mail/mail-config.glade b/mail/mail-config.glade index 7cc0652daf..3e9fa8922b 100644 --- a/mail/mail-config.glade +++ b/mail/mail-config.glade @@ -1787,7 +1787,7 @@ For example: "Work" or "Personal"</property> <property name="update_policy">GTK_UPDATE_ALWAYS</property> <property name="snap_to_ticks">False</property> <property name="wrap">False</property> - <property name="adjustment">10 0 1440 1 10 10</property> + <property name="adjustment">10 1 1440 1 10 10</property> </widget> <packing> <property name="padding">0</property> diff --git a/mail/mail-ops.c b/mail/mail-ops.c index 2b77601f6f..9e3febcd8d 100644 --- a/mail/mail-ops.c +++ b/mail/mail-ops.c @@ -680,7 +680,7 @@ send_queue_send(struct _mail_msg *mm) mail_send_message (message, m->destination, m->driver, &ex); if (!camel_exception_is_set (&ex)) { - camel_folder_set_message_flags (m->queue, send_uids->pdata[i], CAMEL_MESSAGE_DELETED, CAMEL_MESSAGE_DELETED); + camel_folder_set_message_flags (m->queue, send_uids->pdata[i], CAMEL_MESSAGE_DELETED|CAMEL_MESSAGE_SEEN, ~0); } else if (ex.id != CAMEL_EXCEPTION_USER_CANCEL) { /* merge exceptions into one */ if (camel_exception_is_set (&mm->ex)) diff --git a/mail/mail-send-recv.c b/mail/mail-send-recv.c index 7d98874bdf..a45290f924 100644 --- a/mail/mail-send-recv.c +++ b/mail/mail-send-recv.c @@ -829,7 +829,7 @@ mail_autoreceive_setup (void) if (info) { info->keep = source->keep_on_server; if (info->period != source->auto_check_time*60) { - info->period = source->auto_check_time*60; + info->period = MAX(source->auto_check_time*60, 60); g_source_remove(info->timeout_id); info->timeout_id = g_timeout_add(info->period*1000, auto_timeout, info); } @@ -837,7 +837,7 @@ mail_autoreceive_setup (void) info = g_malloc0(sizeof(*info)); info->uri = g_strdup(source->url); info->keep = source->keep_on_server; - info->period = source->auto_check_time*60; + info->period = MAX(source->auto_check_time*60, 60); info->timeout_id = g_timeout_add(info->period*1000, auto_timeout, info); g_hash_table_insert(auto_active, info->uri, info); /* If we do this at startup, it can cause the logon dialog to be hidden, |