aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--camel/ChangeLog9
-rw-r--r--camel/camel-service.h24
-rw-r--r--camel/providers/imap/camel-imap-store.c4
3 files changed, 31 insertions, 6 deletions
diff --git a/camel/ChangeLog b/camel/ChangeLog
index f420de37b0..819b9b8dd4 100644
--- a/camel/ChangeLog
+++ b/camel/ChangeLog
@@ -1,3 +1,12 @@
+2000-07-13 Dan Winship <danw@helixcode.com>
+
+ * camel-service.h: define a set of CAMEL_SERVICE_URL_ALLOW_* flags
+ parallel to the _NEED_* flags, and make the _NEED_* flags imply
+ the _ALLOW_* ones.
+
+ * providers/imap/camel-imap-store.c (camel_imap_store_init): imap
+ urls ALLOW_PATH
+
2000-07-13 Jeffrey Stedfast <fejj@helixcode.com>
* providers/imap/camel-imap-folder.c (imap_get_summary): New
diff --git a/camel/camel-service.h b/camel/camel-service.h
index a4e69ed6f3..1541e32e4a 100644
--- a/camel/camel-service.h
+++ b/camel/camel-service.h
@@ -76,11 +76,25 @@ typedef struct {
-/* flags for url_flags. (others can be added if needed) */
-#define CAMEL_SERVICE_URL_NEED_USER (1 << 1)
-#define CAMEL_SERVICE_URL_NEED_AUTH (1 << 2)
-#define CAMEL_SERVICE_URL_NEED_HOST (1 << 4)
-#define CAMEL_SERVICE_URL_NEED_PATH (1 << 6)
+/* Flags for url_flags. "ALLOW" means the config dialog will let
+ * the user configure it. "NEED" implies "ALLOW" but means the user
+ * must configure it. Service code can assume that any url part
+ * for which it has set the NEED flag will be set when the service
+ * is created.
+ */
+#define CAMEL_SERVICE_URL_ALLOW_USER (1 << 0)
+#define CAMEL_SERVICE_URL_ALLOW_AUTH (1 << 1)
+#define CAMEL_SERVICE_URL_ALLOW_PASSWORD (1 << 2)
+#define CAMEL_SERVICE_URL_ALLOW_HOST (1 << 3)
+#define CAMEL_SERVICE_URL_ALLOW_PORT (1 << 4)
+#define CAMEL_SERVICE_URL_ALLOW_PATH (1 << 5)
+
+#define CAMEL_SERVICE_URL_NEED_USER (1 << 6 | 1 << 0)
+#define CAMEL_SERVICE_URL_NEED_AUTH (1 << 7 | 1 << 1)
+#define CAMEL_SERVICE_URL_NEED_PASSWORD (1 << 8 | 1 << 2)
+#define CAMEL_SERVICE_URL_NEED_HOST (1 << 9 | 1 << 3)
+#define CAMEL_SERVICE_URL_NEED_PORT (1 << 10 | 1 << 4)
+#define CAMEL_SERVICE_URL_NEED_PATH (1 << 11 | 1 << 5)
/* query_auth_types returns a GList of these */
diff --git a/camel/providers/imap/camel-imap-store.c b/camel/providers/imap/camel-imap-store.c
index fc852bd659..07630ed6f5 100644
--- a/camel/providers/imap/camel-imap-store.c
+++ b/camel/providers/imap/camel-imap-store.c
@@ -99,7 +99,9 @@ camel_imap_store_init (gpointer object, gpointer klass)
CamelService *service = CAMEL_SERVICE (object);
CamelStore *store = CAMEL_STORE (object);
- service->url_flags = (CAMEL_SERVICE_URL_NEED_USER | CAMEL_SERVICE_URL_NEED_HOST);
+ service->url_flags = (CAMEL_SERVICE_URL_NEED_USER |
+ CAMEL_SERVICE_URL_NEED_HOST |
+ CAMEL_SERVICE_URL_ALLOW_PATH);
store->folders = g_hash_table_new (g_str_hash, g_str_equal);
}