+2000-06-22 Jeffrey Stedfast <fejj@helixcode.com>
+
+ * providers/sendmail/camel-sendmail-provider.c:
+ * providers/vee/camel-vee-provider.c:
+ * providers/smtp/camel-smtp-provider.c:
+ * providers/mbox/camel-mbox-provider.c:
+ * providers/pop3/camel-pop3-provider.c:
+ * providers/imap/camel-imap-provider.c: Updated
+
+ * camel-session.c: Moved service_cache hash table into the
+ providers.
+ (service_cache_remove): Updated.
+ (camel_session_get_service): Updated.
+
+ * camel-url.c (camel_url_hash): Took out the hashing of
+ url->passwd. We don't want this anymore.
+
+ * providers/imap/camel-imap-folder.c (imap_init): Took out
+ references to 'namespace'
+ (camel_imap_folder_init): Same
+
+ * providers/imap/camel-imap-folder.h: No more namespace. We are
+ instead going to use url->path as the namespace.
+
2000-06-21 Jeffrey Stedfast <fejj@helixcode.com>
* providers/imap/camel-imap-store.c (imap_create): Modified to
* Authors:
* Bertrand Guiheneuf <bertrand@helixcode.com>
* Dan Winship <danw@helixcode.com>
+ * Jeffrey Stedfast <fejj@helixcode.com>
*
* Copyright 1999, 2000 Helix Code, Inc. (http://www.helixcode.com)
*
* itself with @session.
**/
void
-camel_provider_load (CamelSession *session, const char *path,
- CamelException *ex)
+camel_provider_load (CamelSession *session, const char *path, CamelException *ex)
{
GModule *module;
CamelProvider *(*camel_provider_module_init) ();
/*
*
- * Author :
+ * Authors:
* Bertrand Guiheneuf <bertrand@helixcode.com>
+ * Jeffrey Stedfast <fejj@helixcode.com>
*
* Copyright 1999, 2000 Helix Code, Inc. (http://www.helixcode.com)
*
int flags;
GtkType object_types [CAMEL_NUM_PROVIDER_TYPES];
+
+ GHashTable *service_cache;
+
} CamelProvider;
GHashTable *camel_provider_init (void);
-void camel_provider_load (CamelSession *session, const char *path,
- CamelException *ex);
+void camel_provider_load (CamelSession *session, const char *path, CamelException *ex);
/* This is defined by each module, not by camel-provider.c. */
void camel_provider_module_init (CamelSession *session);
* Author:
* Bertrand Guiheneuf <bertrand@helixcode.com>
* Dan Winship <danw@helixcode.com>
+ * Jeffrey Stedfast <fejj@helixcode.com>
*
* Copyright 1999, 2000 Helix Code, Inc. (http://www.helixcode.com)
*
camel_session_init (CamelSession *session)
{
session->modules = camel_provider_init ();
- session->providers =
- g_hash_table_new (g_strcase_hash, g_strcase_equal);
- session->service_cache =
- g_hash_table_new (camel_url_hash, camel_url_equal);
+ session->providers = g_hash_table_new (g_strcase_hash, g_strcase_equal);
+}
+
+static gboolean
+camel_session_destroy_provider (gpointer key, gpointer value, gpointer user_data)
+{
+ CamelProvider *prov = (CamelProvider *)value;
+
+ g_hash_table_destroy (prov->service_cache);
+
+ return TRUE;
}
static void
-camel_session_finalise(GtkObject *o)
+camel_session_finalise (GtkObject *o)
{
CamelSession *session = (CamelSession *)o;
- g_hash_table_destroy(session->service_cache);
- g_hash_table_destroy(session->providers);
+ g_hash_table_foreach_remove (session->providers,
+ camel_session_destroy_provider, NULL);
+ g_hash_table_destroy (session->providers);
GTK_OBJECT_CLASS (parent_class)->finalize (o);
}
g_return_val_if_fail (CAMEL_IS_SESSION (session), NULL);
if (load) {
- g_hash_table_foreach (session->modules, ensure_loaded,
- session);
+ g_hash_table_foreach (session->modules, ensure_loaded, session);
}
list = NULL;
static void
service_cache_remove (CamelService *service, CamelSession *session)
{
- g_hash_table_remove(session->service_cache, service->url);
+ CamelProvider *provider;
+
+ g_return_if_fail (CAMEL_IS_SESSION (session));
+ g_return_if_fail (service != NULL);
+ g_return_if_fail (service->url != NULL);
+
+ provider = g_hash_table_lookup (session->providers, service->url->protocol);
+ g_hash_table_remove (provider->service_cache, service->url);
}
CamelService *
if (!url)
return NULL;
- /* lookup in cache first */
- printf("looking up service in cache: \"%s\"\n", camel_url_to_string (url, FALSE));
- service = g_hash_table_lookup(session->service_cache, url);
- if (service != NULL) {
- printf("found!!\n");
- camel_url_free(url);
- gtk_object_ref((GtkObject *)service);
- return service;
- }
- printf("not found, creating service\n");
-
+ /* We need to look up the provider so we can then lookup
+ the service in the provider's cache */
provider = g_hash_table_lookup (session->providers, url->protocol);
if (!provider) {
/* See if there's one we can load. */
camel_url_free (url);
return NULL;
}
+
+ /* Now look up the service in the provider's cache */
+ printf ("looking up service in cache: \"%s\"\n", camel_url_to_string (url, FALSE));
+ service = g_hash_table_lookup (provider->service_cache, url);
+ if (service != NULL) {
+ printf ("found!!\n");
+ camel_url_free (url);
+ gtk_object_ref (GTK_OBJECT (service));
+ return service;
+ }
+ printf ("not found, creating service\n");
service = camel_service_new (provider->object_types[type], session, url, ex);
if (service) {
- g_hash_table_insert(session->service_cache, url, service);
- gtk_signal_connect((GtkObject *)service, "destroy", service_cache_remove, session);
+ g_hash_table_insert (provider->service_cache, url, service);
+ gtk_signal_connect (GTK_OBJECT (service), "destroy", service_cache_remove, session);
}
return service;
CamelAuthCallback authenticator;
- GHashTable *providers,
- *modules,
- *service_cache;
+ GHashTable *providers, *modules;
};
typedef struct {
}
static void
-add_hash(guint *hash, char *s)
+add_hash (guint *hash, char *s)
{
if (s)
*hash ^= g_str_hash(s);
const CamelURL *u = v;
guint hash = 0;
- add_hash(&hash, u->protocol);
- add_hash(&hash, u->user);
- add_hash(&hash, u->authmech);
- add_hash(&hash, u->passwd);
- add_hash(&hash, u->host);
- add_hash(&hash, u->path);
+ add_hash (&hash, u->protocol);
+ add_hash (&hash, u->user);
+ add_hash (&hash, u->authmech);
+ add_hash (&hash, u->host);
+ add_hash (&hash, u->path);
hash ^= u->port;
+
return hash;
}
folder->can_hold_messages = TRUE;
folder->can_hold_folders = TRUE;
folder->has_summary_capability = TRUE;
- folder->has_search_capability = FALSE; /* default - we have to query IMAP to know for sure */
+ folder->has_search_capability = FALSE; /* default - we have to query IMAP to know for sure */
- imap_folder->namespace = NULL;
imap_folder->summary = NULL;
imap_folder->count = -1;
}
}
CamelFolder *
-camel_imap_folder_new (CamelStore *parent, const char *folder_name, CamelException *ex)
+camel_imap_folder_new (CamelStore *parent, char *folder_name, CamelException *ex)
{
CamelFolder *folder = CAMEL_FOLDER (gtk_object_new (camel_imap_folder_get_type (), NULL));
- CF_CLASS (folder)->init (folder, parent, NULL, folder_name, "/", FALSE, ex);
+ CF_CLASS (folder)->init (folder, parent, NULL, "INBOX", "/", FALSE, ex);
return folder;
}
-void
-camel_imap_folder_set_namespace (CamelFolder *folder, gchar *namespace)
-{
- CamelImapFolder *imap_folder = CAMEL_IMAP_FOLDER (folder);
- g_return_if_fail (folder != NULL);
- g_return_if_fail (namespace != NULL);
-
- if (imap_folder->namespace)
- g_free (imap_folder->namespace);
-
- imap_folder->namespace = g_strdup (namespace);
-}
-
static void
imap_finalize (GtkObject *object)
{
const gchar *name, gchar *separator, gboolean path_begins_with_sep, CamelException *ex)
{
CamelImapFolder *imap_folder = CAMEL_IMAP_FOLDER (folder);
+ CamelStore *store = CAMEL_STORE (parent_store);
+ CamelURL *url = CAMEL_SERVICE (store)->url;
int status;
- char *result;
+ char *result, *folder_path;
/* call parent method */
parent_class->init (folder, parent_store, parent_folder, name, separator, path_begins_with_sep, ex);
imap_folder->search = NULL;
imap_folder->summary = NULL;
- if (!imap_folder->namespace)
- imap_folder->namespace = g_strdup("mail");
/* SELECT the IMAP mail spool */
+ if (url && url->path && strcmp (folder->full_name, "INBOX"))
+ folder_path = g_strdup_printf ("%s/%s", url->path + 1, folder->full_name);
+ else
+ folder_path = g_strdup (folder->full_name);
+
status = camel_imap_command_extended (CAMEL_IMAP_STORE (folder->parent_store), folder,
- &result, "SELECT %s", folder->full_name);
+ &result, "SELECT %s", folder_path);
if (status != CAMEL_IMAP_OK) {
CamelService *service = CAMEL_SERVICE (folder->parent_store);
/* parse the mode we opened it in */
}
g_free (result);
+ g_free (folder_path);
}
static void
/* look to see if any of those subfolders match... */
max = lsub->len;
for (i = 0; i < max; i++) {
- if (!strcmp(g_ptr_array_index (lsub, i), folder->full_name)) {
+ if (!strcmp (g_ptr_array_index (lsub, i), folder->full_name)) {
exists = TRUE;
break;
}
imap_get_message_count (CamelFolder *folder, CamelException *ex)
{
CamelImapFolder *imap_folder = CAMEL_IMAP_FOLDER (folder);
- gchar *result, *msg_count;
+ CamelStore *store = CAMEL_STORE (folder->parent_store);
+ CamelURL *url = CAMEL_SERVICE (store)->url;
+ gchar *result, *msg_count, *folder_path;
gint status;
g_return_val_if_fail (folder != NULL, -1);
if (imap_folder->count != -1)
return imap_folder->count;
+ if (url && url->path && strcmp (folder->full_name, "INBOX"))
+ folder_path = g_strdup_printf ("%s/%s", url->path + 1, folder->full_name);
+ else
+ folder_path = g_strdup (folder->full_name);
+
status = camel_imap_command_extended (CAMEL_IMAP_STORE (folder->parent_store), folder,
&result, "STATUS %s (MESSAGES)", folder->full_name);
status == CAMEL_IMAP_ERR ? result :
"Unknown error");
g_free (result);
+ g_free (folder_path);
return -1;
}
+ g_free (folder_path);
/* parse out the message count - should come in the form: "* STATUS <folder> (MESSAGES <count>)\r\n" */
if (result && *result == '*') {
static void
imap_append_message (CamelFolder *folder, CamelMimeMessage *message, CamelException *ex)
{
+ CamelStore *store = CAMEL_STORE (folder->parent_store);
+ CamelURL *url = CAMEL_SERVICE (store)->url;
CamelStreamMem *mem;
- gchar *result;
+ gchar *result, *folder_path;
gint status;
g_return_if_fail (folder != NULL);
}
mem->buffer = g_byte_array_append (mem->buffer, g_strdup("\r\n"), 3);
+ if (url && url->path && strcmp(folder->full_name, "INBOX"))
+ folder_path = g_strdup_printf ("%s/%s", url->path, folder->full_name);
+ else
+ folder_path = g_strdup (folder->full_name);
status = camel_imap_command (CAMEL_IMAP_STORE (folder->parent_store),
folder, &result,
"APPEND %s (\\Seen) {%d}\r\n%s",
- folder->full_name,
+ folder_path,
mem->buffer->len,
mem->buffer->data);
status == CAMEL_IMAP_ERR ? result :
"Unknown error");
g_free (result);
+ g_free (folder_path);
return;
}
- g_free(result);
- return;
+ g_free (result);
+ g_free (folder_path);
}
static GPtrArray *
imap_get_subfolder_names (CamelFolder *folder, CamelException *ex)
{
CamelImapFolder *imap_folder = CAMEL_IMAP_FOLDER (folder);
+ CamelStore *store = CAMEL_STORE (folder->parent_store);
+ CamelURL *url = CAMEL_SERVICE (store)->url;
GPtrArray *listing;
gint status;
- gchar *result, *fname;
+ gchar *result, *folder_path;
g_return_val_if_fail (folder != NULL, g_ptr_array_new());
if (imap_folder->count != -1)
return g_ptr_array_new ();
- if (!strcmp (folder->full_name, "INBOX"))
- fname = imap_folder->namespace;
- else
- fname = folder->full_name;
+ if (url && url->path) {
+ if (!strcmp (folder->full_name, "INBOX"))
+ folder_path = g_strdup (url->path + 1);
+ else
+ folder_path = g_strdup_printf ("%s/%s", url->path + 1, folder->full_name);
+ } else {
+ folder_path = g_strdup (folder->full_name);
+ }
status = camel_imap_command_extended (CAMEL_IMAP_STORE (folder->parent_store), folder,
- &result, "LIST \"\" \"%s/*\"", fname);
+ &result, "LIST \"\" \"%s/*\"", folder_path);
if (status != CAMEL_IMAP_OK) {
CamelService *service = CAMEL_SERVICE (folder->parent_store);
status == CAMEL_IMAP_ERR ? result :
"Unknown error");
g_free (result);
+ g_free (folder_path);
return g_ptr_array_new ();
}
}
g_free (flags);
- f = folder + strlen (fname) + 1;
- memmove (folder, f, strlen (f) + 1);
+ /* chop out the folder prefix */
+ if (!strncmp (folder, folder_path, strlen (folder_path))) {
+ f = folder + strlen (folder_path) + 1;
+ memmove (folder, f, strlen (f) + 1);
+ }
printf ("adding folder: %s\n", folder);
g_ptr_array_add (listing, folder);
ptr++;
}
}
- g_free(result);
+ g_free (result);
+ g_free (folder_path);
return listing;
}
CamelFolderSearch *search; /* used to run searches */
GPtrArray *summary;
- gchar *namespace;
gint count;
} CamelImapFolder;
/* public methods */
-CamelFolder *camel_imap_folder_new (CamelStore *parent,
- const char *folder_name,
+CamelFolder *camel_imap_folder_new (CamelStore *parent, char *folder_name,
CamelException *ex);
void camel_imap_folder_set_namespace (CamelFolder *folder, gchar *namespace);
#include "camel-imap-store.h"
#include "camel-provider.h"
#include "camel-session.h"
+#include "camel-url.h"
+
+static void add_hash (guint *hash, char *s);
+static guint imap_url_hash (gconstpointer key);
+static gint check_equal (char *s1, char *s2);
+static gint imap_url_equal (gconstpointer a, gconstpointer b);
static CamelProvider imap_provider = {
"imap",
0,
- { 0, 0 }
+ { 0, 0 },
+
+ NULL
};
void
imap_provider.object_types[CAMEL_PROVIDER_STORE] =
camel_imap_store_get_type();
+ imap_provider.service_cache = g_hash_table_new (imap_url_hash, imap_url_equal);
+
camel_session_register_provider (session, &imap_provider);
}
+static void
+add_hash (guint *hash, char *s)
+{
+ if (s)
+ *hash ^= g_str_hash(s);
+}
+
+static guint
+imap_url_hash (gconstpointer key)
+{
+ const CamelURL *u = (CamelURL *)key;
+ guint hash = 0;
+ add_hash (&hash, u->user);
+ add_hash (&hash, u->authmech);
+ add_hash (&hash, u->host);
+ hash ^= u->port;
+
+ return hash;
+}
+
+static gint
+check_equal (char *s1, char *s2)
+{
+ if (s1 == NULL) {
+ if (s2 == NULL)
+ return TRUE;
+ else
+ return FALSE;
+ }
+
+ if (s2 == NULL)
+ return FALSE;
+
+ return strcmp (s1, s2) == 0;
+}
+
+static gint
+imap_url_equal (gconstpointer a, gconstpointer b)
+{
+ const CamelURL *u1 = a, *u2 = b;
+
+ return check_equal (u1->user, u2->user)
+ && check_equal (u1->authmech, u2->authmech)
+ && check_equal (u1->host, u2->host)
+ && u1->port == u2->port;
+}
return TRUE;
/* create the directory for the subfolder */
- if (url && url->path)
- folder_path = g_strdup_printf ("%s/%s", url->path, folder->full_name);
+ if (url && url->path && strcmp (folder->full_name, "INBOX"))
+ folder_path = g_strdup_printf ("%s/%s", url->path + 1, folder->full_name);
else
folder_path = g_strdup (folder->full_name);
+
status = camel_imap_command_extended (CAMEL_IMAP_STORE (folder->parent_store), NULL,
&result, "CREATE %s", folder_path);
get_folder (CamelStore *store, const char *folder_name, gboolean create, CamelException *ex)
{
CamelFolder *new_folder;
+ char *folder_path;
g_return_val_if_fail (store != NULL, NULL);
g_return_val_if_fail (folder_name != NULL, NULL);
-
- new_folder = camel_imap_folder_new (store, folder_name, ex);
+
+ folder_path = g_strdup (folder_name);
+ new_folder = camel_imap_folder_new (store, folder_path, ex);
if (!imap_create (new_folder, ex)) {
/* we should set an exception */
gint
camel_imap_command (CamelImapStore *store, CamelFolder *folder, char **ret, char *fmt, ...)
{
+ CamelURL *url = CAMEL_SERVICE (store)->url;
gchar *cmdbuf, *respbuf;
gchar *cmdid;
va_list ap;
if (folder && store->current_folder != folder && strncmp (fmt, "STATUS", 6) &&
strncmp (fmt, "CREATE", 5) && strcmp (fmt, "CAPABILITY")) {
/* We need to select the correct mailbox first */
- char *r;
+ char *r, *folder_path;
int s;
- s = camel_imap_command_extended (store, folder, &r, "SELECT %s", folder->full_name);
+ if (url && url->path && strcmp (folder->full_name, "INBOX"))
+ folder_path = g_strdup_printf ("%s/%s", url->path + 1, folder->full_name);
+ else
+ folder_path = g_strdup (folder->full_name);
+
+ s = camel_imap_command_extended (store, folder, &r, "SELECT %s", folder_path);
+ g_free (folder_path);
if (s != CAMEL_IMAP_OK) {
*ret = r;
return s;
g_free (cmdbuf);
g_free (cmdid);
if (*ret)
- *ret = g_strdup (strerror(errno));
+ *ret = g_strdup (strerror (errno));
return CAMEL_IMAP_FAIL;
}
g_free (cmdbuf);
respbuf = camel_stream_buffer_read_line (CAMEL_STREAM_BUFFER (store->istream));
if (respbuf == NULL) {
if (*ret)
- *ret = g_strdup (strerror(errno));
+ *ret = g_strdup (strerror (errno));
return CAMEL_IMAP_FAIL;
}
- fprintf(stderr, "received: %s\n", respbuf ? respbuf : "(null)");
+ fprintf (stderr, "received: %s\n", respbuf ? respbuf : "(null)");
fflush (stderr);
status = camel_imap_status (cmdid, respbuf);
gint
camel_imap_command_extended (CamelImapStore *store, CamelFolder *folder, char **ret, char *fmt, ...)
{
+ CamelURL *url = CAMEL_SERVICE (CAMEL_STORE (store))->url;
CamelStreamBuffer *stream = CAMEL_STREAM_BUFFER (store->istream);
GPtrArray *data;
gchar *cmdid, *cmdbuf, *respbuf;
if (folder && store->current_folder != folder && strncmp (fmt, "SELECT", 6) &&
strncmp (fmt, "STATUS", 6) && strncmp (fmt, "CREATE", 5) && strcmp (fmt, "CAPABILITY")) {
/* We need to select the correct mailbox first */
- char *r;
+ char *r, *folder_path;
int s;
- s = camel_imap_command_extended (store, folder, &r, "SELECT %s", folder->full_name);
+ if (url && url->path && strcmp (folder->full_name, "INBOX"))
+ folder_path = g_strdup_printf ("%s/%s", url->path + 1, folder->full_name);
+ else
+ folder_path = g_strdup (folder->full_name);
+
+ s = camel_imap_command_extended (store, folder, &r, "SELECT %s", folder_path);
+ g_free (folder_path);
if (s != CAMEL_IMAP_OK) {
*ret = r;
return s;
respbuf = camel_stream_buffer_read_line (stream);
if (!respbuf || !strncmp(respbuf, cmdid, strlen(cmdid)) ) {
/* IMAP's last response starts with our command id */
- fprintf(stderr, "received: %s\n", respbuf ? respbuf : "(null)");
+ fprintf (stderr, "received: %s\n", respbuf ? respbuf : "(null)");
break;
}
- fprintf(stderr, "received: %s\n", respbuf);
+ fprintf (stderr, "received: %s\n", respbuf);
g_ptr_array_add (data, respbuf);
}
CamelFolder *current_folder;
CamelStream *istream, *ostream;
+
guint32 command;
} CamelImapStore;
#include "camel-mbox-store.h"
#include "camel-provider.h"
#include "camel-session.h"
+#include "camel-url.h"
static CamelProvider mbox_provider = {
"mbox",
0,
- { 0, 0 }
+ { 0, 0 },
+
+ NULL
};
void
mbox_provider.object_types[CAMEL_PROVIDER_STORE] =
camel_mbox_store_get_type();
+ mbox_provider.service_cache = g_hash_table_new (camel_url_hash, camel_url_equal);
+
camel_session_register_provider (session, &mbox_provider);
}
#include "camel-pop3-store.h"
#include "camel-provider.h"
#include "camel-session.h"
+#include "camel-url.h"
static CamelProvider pop3_provider = {
"pop",
CAMEL_PROVIDER_IS_REMOTE,
- { 0, 0 }
+ { 0, 0 },
+
+ NULL
};
void
pop3_provider.object_types[CAMEL_PROVIDER_STORE] =
camel_pop3_store_get_type();
+ pop3_provider.service_cache = g_hash_table_new (camel_url_hash, camel_url_equal);
+
camel_session_register_provider (session, &pop3_provider);
}
#include "camel-provider.h"
#include "camel-sendmail-transport.h"
#include "camel-session.h"
+#include "camel-url.h"
static CamelProvider sendmail_provider = {
"sendmail",
0,
- { 0, 0 }
+ { 0, 0 },
+
+ NULL
};
void
sendmail_provider.object_types[CAMEL_PROVIDER_TRANSPORT] =
camel_sendmail_transport_get_type();
+ sendmail_provider.service_cache = g_hash_table_new (camel_url_hash, camel_url_equal);
+
camel_session_register_provider (session, &sendmail_provider);
}
#include "camel-smtp-transport.h"
#include "camel-provider.h"
#include "camel-session.h"
+#include "camel-url.h"
static CamelProvider smtp_provider = {
"smtp",
0,
- { 0, 0 }
+ { 0, 0 },
+
+ NULL
};
void
smtp_provider.object_types[CAMEL_PROVIDER_TRANSPORT] =
camel_smtp_transport_get_type();
+ smtp_provider.service_cache = g_hash_table_new (camel_url_hash, camel_url_equal);
+
camel_session_register_provider (session, &smtp_provider);
}
#include "camel-vee-store.h"
#include "camel-provider.h"
#include "camel-session.h"
+#include "camel-url.h"
static CamelProvider vee_provider = {
"vfolder",
0,
- { 0, 0 }
+ { 0, 0 },
+
+ NULL
};
void
vee_provider.object_types[CAMEL_PROVIDER_STORE] =
camel_vee_store_get_type();
+ vee_provider.service_cache = g_hash_table_new (camel_url_hash, camel_url_equal);
+
camel_session_register_provider (session, &vee_provider);
}
projects / platform / upstream / evolution-data-server.git / commitdiff