diff options
| -rw-r--r-- | ChangeLog | 10 | ||||
| -rw-r--r-- | camel/camel-session.c | 4 | ||||
| -rw-r--r-- | camel/camel-store.c | 8 | ||||
| -rw-r--r-- | camel/camel-store.h | 4 | ||||
| -rw-r--r-- | camel/providers/MH/camel-mh-store.c | 4 |
5 files changed, 21 insertions, 9 deletions
@@ -1,5 +1,15 @@ 1999-08-12 bertrand <Bertrand.Guiheneuf@aful.org> + * camel/camel-session.c (camel_session_get_store_for_protocol): + compilation and runtime fixes. + + * camel/providers/MH/camel-mh-store.c (_init): + synced with CamelStore. + + * camel/camel-store.c (_init): + in CamelStore::init, url_name is now const. + disabled url_name copy. + * camel/camel-session.c (camel_session_get_store): new function: returns a store for an URL. (camel_session_get_store_for_protocol): diff --git a/camel/camel-session.c b/camel/camel-session.c index 2c2d64ade6..a32ff510a4 100644 --- a/camel/camel-session.c +++ b/camel/camel-session.c @@ -23,6 +23,8 @@ #include <config.h> #include "camel-session.h" #include "string-utils.h" +#include "url-util.h" +#include "camel-provider.h" static GtkObjectClass *parent_class=NULL; @@ -154,7 +156,7 @@ camel_session_get_store_from_provider (CamelSession *session, CamelProvider *pro CamelStore * camel_session_get_store_for_protocol (CamelSession *session, const gchar *protocol) { - CamelProvider *provider = NULL; + const CamelProvider *provider = NULL; CamelStore *new_store; /* look if there is a provider assiciated to this diff --git a/camel/camel-store.c b/camel/camel-store.c index 2168b3732c..209a03d101 100644 --- a/camel/camel-store.c +++ b/camel/camel-store.c @@ -32,7 +32,7 @@ static CamelServiceClass *parent_class = NULL; static void _set_separator(CamelStore *store, gchar sep); static CamelFolder *_get_root_folder(CamelStore *store); static CamelFolder *_get_default_folder(CamelStore *store); -static void _init(CamelStore *store, CamelSession *session, gchar *url_name); +static void _init(CamelStore *store, CamelSession *session, const gchar *url_name); static CamelFolder *_get_folder (CamelStore *store, const gchar *folder_name); static gchar _get_separator (CamelStore *store); @@ -102,7 +102,7 @@ camel_store_get_type (void) * **/ void -camel_store_init (CamelStore *store, CamelSession *session, gchar *url_name) +camel_store_init (CamelStore *store, CamelSession *session, const gchar *url_name) { g_assert(store); CS_CLASS(store)->init (store, session, url_name); @@ -121,7 +121,7 @@ camel_store_init (CamelStore *store, CamelSession *session, gchar *url_name) * **/ static void -_init (CamelStore *store, CamelSession *session, gchar *url_name) +_init (CamelStore *store, CamelSession *session, const gchar *url_name) { #warning re-enable assertion here. @@ -131,7 +131,7 @@ _init (CamelStore *store, CamelSession *session, gchar *url_name) if (store->session) gtk_object_unref (GTK_OBJECT (store->session)); store->session = session; gtk_object_ref (GTK_OBJECT (session)); - store->url_name = url_name; + /*store->url_name = url_name;*/ } diff --git a/camel/camel-store.h b/camel/camel-store.h index fea908ce99..9634e9d0e7 100644 --- a/camel/camel-store.h +++ b/camel/camel-store.h @@ -59,7 +59,7 @@ struct _CamelStore typedef struct { CamelServiceClass parent_class; - void (*init) (CamelStore *store, CamelSession *session, gchar *url_name); + void (*init) (CamelStore *store, CamelSession *session, const gchar *url_name); void (*set_separator) (CamelStore *store, gchar sep); gchar (*get_separator) (CamelStore *store); CamelFolder * (*get_folder) (CamelStore *store, const gchar *folder_name); @@ -74,7 +74,7 @@ typedef struct { /* Standard Gtk function */ GtkType camel_store_get_type (void); -void camel_store_init (CamelStore *store, CamelSession *session, gchar *url_name); +void camel_store_init (CamelStore *store, CamelSession *session, const gchar *url_name); CamelFolder *camel_store_get_folder (CamelStore *store, const gchar *folder_name); gchar camel_store_get_separator (CamelStore *store); diff --git a/camel/providers/MH/camel-mh-store.c b/camel/providers/MH/camel-mh-store.c index bb27e37620..5a911feb25 100644 --- a/camel/providers/MH/camel-mh-store.c +++ b/camel/providers/MH/camel-mh-store.c @@ -32,7 +32,7 @@ static CamelStoreClass *parent_class=NULL; #define CF_CLASS(so) CAMEL_FOLDER_CLASS (GTK_OBJECT(so)->klass) #define CMHF_CLASS(so) CAMEL_MH_FOLDER_CLASS (GTK_OBJECT(so)->klass) -static void _init (CamelStore *store, CamelSession *session, gchar *url_name); +static void _init (CamelStore *store, CamelSession *session, const gchar *url_name); static CamelFolder *_get_folder (CamelStore *store, const gchar *folder_name); @@ -108,7 +108,7 @@ camel_mh_store_get_toplevel_dir (CamelMhStore *store) static void -_init (CamelStore *store, CamelSession *session, gchar *url_name) +_init (CamelStore *store, CamelSession *session, const gchar *url_name) { CamelMhStore *mh_store = CAMEL_MH_STORE (store); Gurl *store_url; |