[dovecot-cvs] dovecot/src/plugins/trash trash-plugin.c,1.12,1.13

[tss at dovecot.org]

Update of /var/lib/cvs/dovecot/src/plugins/trash
In directory talvi:/tmp/cvs-serv23558/trash

Modified Files:
	trash-plugin.c 
Log Message:
s/quota/quota_set/ so we don't conflict with the quota symbol already
present in Mac OS X.



Index: trash-plugin.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/plugins/trash/trash-plugin.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- trash-plugin.c	4 Nov 2006 19:51:23 -0000	1.12
+++ trash-plugin.c	12 Nov 2006 18:48:34 -0000	1.13
@@ -103,7 +103,7 @@
 			   we get proper namespace support for lib-storage. */
 			struct mail_storage *const *storage;
 
-			storage = array_idx(&quota->storages, 0);
+			storage = array_idx(&quota_set->storages, 0);
 			trashes[i].storage = *storage;
 		}
 		/* expunge oldest mails first in all trash boxes with
@@ -246,7 +246,7 @@
 	if (env == NULL)
 		return;
 
-	if (quota == NULL) {
+	if (quota_set == NULL) {
 		i_error("trash plugin: quota plugin not initialized");
 		return;
 	}
@@ -255,13 +255,13 @@
 	if (read_configuration(env) < 0)
 		return;
 
-	trash_next_quota_test_alloc = quota->test_alloc;
-	quota->test_alloc = trash_quota_test_alloc;
+	trash_next_quota_test_alloc = quota_set->test_alloc;
+	quota_set->test_alloc = trash_quota_test_alloc;
 }
 
 void trash_plugin_deinit(void)
 {
-	quota->test_alloc = trash_next_quota_test_alloc;
+	quota_set->test_alloc = trash_next_quota_test_alloc;
 
 	if (config_pool != NULL)
 		pool_unref(config_pool);