[dovecot-cvs] dovecot/src/lib-storage mail-namespace.c, 1.4, 1.5 mail-storage.c, 1.79, 1.80 mail-storage.h, 1.129, 1.130 mailbox-list-private.h, 1.6, 1.7 mailbox-list.h, 1.9, 1.10

[tss at dovecot.org]

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

Modified Files:
	mail-namespace.c mail-storage.c mail-storage.h 
	mailbox-list-private.h mailbox-list.h 
Log Message:
Removed HAS_INBOX and SHARED_NAMESPACE flags from mail storage and mailbox
list flags. They can be directly taken from struct mail_namespace.



Index: mail-namespace.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/lib-storage/mail-namespace.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- mail-namespace.c	17 Apr 2007 15:29:37 -0000	1.4
+++ mail-namespace.c	17 Apr 2007 15:39:30 -0000	1.5
@@ -54,11 +54,6 @@
 		return NULL;
 	}
 
-	if (ns->type != NAMESPACE_PRIVATE)
-		flags |= MAIL_STORAGE_FLAG_SHARED_NAMESPACE;
-	if (ns->inbox)
-		flags |= MAIL_STORAGE_FLAG_HAS_INBOX;
-
 	if (prefix == NULL)
 		prefix = "";
 
@@ -136,7 +131,6 @@
 	ns->subscriptions = TRUE;
 	ns->prefix = "";
 
-	flags |= MAIL_STORAGE_FLAG_HAS_INBOX;
 	if (mail_storage_create(ns, NULL, mail, user, flags, lock_method) < 0) {
 		if (mail != NULL && *mail != '\0')
 			i_error("Failed to create storage with data: %s", mail);
@@ -163,6 +157,7 @@
 
 	ns = p_new(pool, struct mail_namespace, 1);
 	ns->prefix = "";
+	ns->inbox = TRUE;
 	return ns;
 }
 

Index: mail-storage.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/lib-storage/mail-storage.c,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -d -r1.79 -r1.80
--- mail-storage.c	3 Apr 2007 08:34:29 -0000	1.79
+++ mail-storage.c	17 Apr 2007 15:39:30 -0000	1.80
@@ -401,8 +401,6 @@
 
 	if ((storage_flags & MAIL_STORAGE_FLAG_DEBUG) != 0)
 		list_flags |= MAILBOX_LIST_FLAG_DEBUG;
-	if ((storage_flags & MAIL_STORAGE_FLAG_HAS_INBOX) != 0)
-		list_flags |= MAILBOX_LIST_FLAG_INBOX;
 	if ((storage_flags & MAIL_STORAGE_FLAG_FULL_FS_ACCESS) != 0)
 		list_flags |= MAILBOX_LIST_FLAG_FULL_FS_ACCESS;
 	if ((storage_flags & MAIL_STORAGE_FLAG_DOTLOCK_USE_EXCL) != 0)

Index: mail-storage.h
===================================================================
RCS file: /var/lib/cvs/dovecot/src/lib-storage/mail-storage.h,v
retrieving revision 1.129
retrieving revision 1.130
diff -u -d -r1.129 -r1.130
--- mail-storage.h	3 Apr 2007 08:34:29 -0000	1.129
+++ mail-storage.h	17 Apr 2007 15:39:30 -0000	1.130
@@ -24,8 +24,6 @@
 	MAIL_STORAGE_FLAG_KEEP_HEADER_MD5	= 0x10,
 	/* Use CRLF linefeeds when saving mails. */
 	MAIL_STORAGE_FLAG_SAVE_CRLF		= 0x40,
-	/* The storage points to shared namespaces */
-	MAIL_STORAGE_FLAG_SHARED_NAMESPACE	= 0x80,
 	/* Don't try to autodetect anything, require that the given data 
 	   contains all the necessary information. */
 	MAIL_STORAGE_FLAG_NO_AUTODETECTION	= 0x100,
@@ -33,9 +31,7 @@
 	   fail to create the storage. */
 	MAIL_STORAGE_FLAG_NO_AUTOCREATE		= 0x200,
 	/* Rely on O_EXCL when creating dotlocks */
-	MAIL_STORAGE_FLAG_DOTLOCK_USE_EXCL	= 0x400,
-	/* Ths storage contains INBOX */
-	MAIL_STORAGE_FLAG_HAS_INBOX		= 0x800
+	MAIL_STORAGE_FLAG_DOTLOCK_USE_EXCL	= 0x400
 };
 
 enum mailbox_open_flags {

Index: mailbox-list-private.h
===================================================================
RCS file: /var/lib/cvs/dovecot/src/lib-storage/mailbox-list-private.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- mailbox-list-private.h	11 Apr 2007 19:28:23 -0000	1.6
+++ mailbox-list-private.h	17 Apr 2007 15:39:30 -0000	1.7
@@ -6,6 +6,7 @@
 #define MAILBOX_LIST_ERR_MAILBOX_NOT_FOUND "Mailbox doesn't exist: %s"
 #define MAILBOX_LIST_ERR_NO_PERMISSION "Permission denied"
 
+#include "mail-namespace.h"
 #include "mailbox-list.h"
 
 struct dirent;

Index: mailbox-list.h
===================================================================
RCS file: /var/lib/cvs/dovecot/src/lib-storage/mailbox-list.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- mailbox-list.h	11 Apr 2007 19:28:23 -0000	1.9
+++ mailbox-list.h	17 Apr 2007 15:39:30 -0000	1.10
@@ -8,8 +8,6 @@
 enum mailbox_list_flags {
 	/* Print debugging information while initializing the driver */
 	MAILBOX_LIST_FLAG_DEBUG			= 0x01,
-	/* This mailbox list contains INBOX. Match case-insensitively for it. */
-	MAILBOX_LIST_FLAG_INBOX			= 0x02,
 	/* Allow full filesystem access with absolute or relative paths. */
 	MAILBOX_LIST_FLAG_FULL_FS_ACCESS	= 0x04,
 	/* Rely on O_EXCL when creating dotlocks */