← Back to branch summary

~ubuntu-branches/ubuntu/utopic/dovecot/utopic-proposed

« back to all changes in this revision

Viewing changes to src/lib-storage/index/index-mailbox-check.c

  • Committer: Package Import Robot
  • Author(s): James Page
  • Date: 2014-01-08 09:35:49 UTC
  • mfrom: (4.1.35 sid)
  • Revision ID: package-import@ubuntu.com-20140108093549-i72o93pux8p0dlaf
Tags: 1:2.2.9-1ubuntu1
* Merge from Debian unstable, remaining changes:
  + Add mail-stack-delivery package:
    - Update d/rules
    - d/control: convert existing dovecot-postfix package to a dummy
      package and add new mail-stack-delivery package.
    - Update maintainer scripts.
    - Rename d/dovecot-postfix.* to debian/mail-stack-delivery.*
    - d/mail-stack-delivery.preinst: Move previously installed backups and
      config files to a new package namespace.
    - d/mail-stack-delivery.prerm: Added to handle downgrades.
  + Use Snakeoil SSL certificates by default:
    - d/control: Depend on ssl-cert.
    - d/dovecot-core.postinst: Relax grep for SSL_* a bit.
  + Add autopkgtest to debian/tests/*.
  + Add ufw integration:
    - d/dovecot-core.ufw.profile: new ufw profile.
    - d/rules: install profile in dovecot-core.
    - d/control: dovecot-core - suggest ufw.
  + d/dovecot-core.dirs: Added usr/share/doc/dovecot-core
  + Add apport hook:
    - d/rules, d/source_dovecot.py
  + Add upstart job:
    - d/rules, d/dovecot-core.dovecot.upstart, d/control,
      d/dovecot-core.dirs, dovecot-imapd.{postrm, postinst, prerm},
      d/dovecot-pop3d.{postinst, postrm, prerm}.
      d/mail-stack-deliver.postinst: Convert init script to upstart.
  + Use the autotools-dev dh addon to update config.guess/config.sub for
    arm64.
* Dropped changes, included in Debian:
  - Update Dovecot name to reflect distribution in login greeting.
  - Update Drac plugin for >= 2.0.0 support.
* d/control: Drop dovecot-postfix package as its no longer required.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/lib-storage/index/index-mailbox-check.c
1
 
/* Copyright (c) 2002-2012 Dovecot authors, see the included COPYING file */
 
1
/* Copyright (c) 2002-2013 Dovecot authors, see the included COPYING file */
2
2
 
3
3
#include "lib.h"
4
4
#include "ioloop.h"
59
59
 
60
60
        if (ibox->notify_delay_to == NULL) {
61
61
                ibox->notify_delay_to =
62
 
                        timeout_add(NOTIFY_DELAY_MSECS,
63
 
                                    notify_delay_callback, box);
 
62
                        timeout_add_short(NOTIFY_DELAY_MSECS,
 
63
                                          notify_delay_callback, box);
64
64
        }
65
65
}
66
66
 
67
67
void index_mailbox_check_add(struct mailbox *box, const char *path)
68
68
{
69
69
        struct index_mailbox_context *ibox = INDEX_STORAGE_CONTEXT(box);
 
70
        const struct mail_storage_settings *set = box->storage->set;
70
71
        struct index_notify_file *file;
71
72
        struct stat st;
72
73
        struct io *io = NULL;
73
74
        struct index_notify_io *aio;
74
75
 
75
 
        i_assert(box->notify_min_interval > 0);
 
76
        i_assert(set->mailbox_idle_check_interval > 0);
76
77
 
77
78
        (void)io_add_notify(path, notify_callback, box, &io);
78
79
        if (io != NULL) {
94
95
         * when the filesystem is remote (NFS, ...) */
95
96
        if (ibox->notify_to == NULL) {
96
97
                ibox->notify_to =
97
 
                        timeout_add(box->notify_min_interval * 1000,
 
98
                        timeout_add(set->mailbox_idle_check_interval * 1000,
98
99
                                    check_timeout, box);
99
100
        }
100
101
}