[dovecot-cvs] dovecot/src/lib-storage/index index-mailbox-check.c, 1.15, 1.16 index-storage.h, 1.118, 1.119

[tss at dovecot.org]

Update of /var/lib/cvs/dovecot/src/lib-storage/index
In directory talvi:/tmp/cvs-serv29641/index

Modified Files:
	index-mailbox-check.c index-storage.h 
Log Message:
Moved notify settings to struct mailbox. Removed the parameters from
notify_changes(), they're now set before calling it.



Index: index-mailbox-check.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/lib-storage/index/index-mailbox-check.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- index-mailbox-check.c	15 Dec 2006 18:38:20 -0000	1.15
+++ index-mailbox-check.c	30 Mar 2007 18:41:05 -0000	1.16
@@ -31,7 +31,7 @@
 	/* check changes only when we can also notify of new mail */
 	last_check = I_MAX(ibox->sync_last_check, ibox->notify_last_check);
 	if ((unsigned int)(ioloop_time - last_check) <
-	    ibox->min_notify_interval)
+	    ibox->box.notify_min_interval)
 		return;
 
 	ibox->notify_last_check = ioloop_time;
@@ -48,7 +48,7 @@
 	if (notify) {
 		ibox->notify_last_sent = ioloop_time;
 		ibox->notify_pending = FALSE;
-		ibox->notify_callback(&ibox->box, ibox->notify_context);
+		ibox->box.notify_callback(&ibox->box, ibox->box.notify_context);
 	}
 }
 
@@ -56,10 +56,10 @@
 {
 	ibox->notify_last_check = ioloop_time;
 	if ((unsigned int)(ioloop_time - ibox->notify_last_sent) >=
-	    ibox->min_notify_interval) {
+	    ibox->box.notify_min_interval) {
 		ibox->notify_last_sent = ioloop_time;
                 ibox->notify_pending = FALSE;
-		ibox->notify_callback(&ibox->box, ibox->notify_context);
+		ibox->box.notify_callback(&ibox->box, ibox->box.notify_context);
 	} else {
 		ibox->notify_pending = TRUE;
 	}

Index: index-storage.h
===================================================================
RCS file: /var/lib/cvs/dovecot/src/lib-storage/index/index-storage.h,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -d -r1.118 -r1.119
--- index-storage.h	30 Mar 2007 14:12:48 -0000	1.118
+++ index-storage.h	30 Mar 2007 18:41:05 -0000	1.119
@@ -41,9 +41,6 @@
 	struct index_notify_file *notify_files;
         struct index_notify_io *notify_ios;
 	time_t notify_last_check, notify_last_sent;
-	unsigned int min_notify_interval;
-	mailbox_notify_callback_t *notify_callback;
-	void *notify_context;
 
 	time_t next_lock_notify; /* temporary */
 	enum mailbox_lock_notify_type last_notify_type;