[evolution-data-server] CamelImapStore: Remove unused 'base_url' member.
- From: Matthew Barnes <mbarnes src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evolution-data-server] CamelImapStore: Remove unused 'base_url' member.
- Date: Mon, 26 Sep 2011 13:45:19 +0000 (UTC)
commit 31147cac1d47089c0588c87f3fb97676a668000a
Author: Matthew Barnes <mbarnes redhat com>
Date: Sun Sep 25 21:02:23 2011 -0400
CamelImapStore: Remove unused 'base_url' member.
camel/providers/imap/camel-imap-store.c | 10 +---------
camel/providers/imap/camel-imap-store.h | 2 +-
2 files changed, 2 insertions(+), 10 deletions(-)
---
diff --git a/camel/providers/imap/camel-imap-store.c b/camel/providers/imap/camel-imap-store.c
index c17655c..1e5c02e 100644
--- a/camel/providers/imap/camel-imap-store.c
+++ b/camel/providers/imap/camel-imap-store.c
@@ -859,8 +859,6 @@ imap_store_finalize (GObject *object)
/* This frees current_folder, folders, authtypes, streams, and namespace. */
camel_service_disconnect_sync (CAMEL_SERVICE (imap_store), TRUE, NULL);
- g_free (imap_store->base_url);
-
/* Chain up to parent's finalize() method. */
G_OBJECT_CLASS (camel_imap_store_parent_class)->finalize (object);
}
@@ -1218,7 +1216,6 @@ imap_store_initable_init (GInitable *initable,
CamelStore *store;
CamelService *service;
CamelSettings *settings;
- CamelURL *url;
const gchar *user_cache_dir;
const gchar *real_path;
gboolean use_real_path;
@@ -1235,15 +1232,10 @@ imap_store_initable_init (GInitable *initable,
if (!parent_initable_interface->init (initable, cancellable, error))
return FALSE;
- url = camel_service_get_camel_url (service);
+ service = CAMEL_SERVICE (initable);
settings = camel_service_get_settings (service);
user_cache_dir = camel_service_get_user_cache_dir (service);
- /* FIXME */
- imap_store->base_url = camel_url_to_string (
- url, CAMEL_URL_HIDE_PASSWORD |
- CAMEL_URL_HIDE_PARAMS | CAMEL_URL_HIDE_AUTH);
-
/* XXX Using CamelStoreFlags like this is suboptimal because they're
* only set once during initialization. Subsequent changes to the
* CamelSettings are not propagated to the flags -- a restart
diff --git a/camel/providers/imap/camel-imap-store.h b/camel/providers/imap/camel-imap-store.h
index 918e5c3..700dd0a 100644
--- a/camel/providers/imap/camel-imap-store.h
+++ b/camel/providers/imap/camel-imap-store.h
@@ -102,7 +102,7 @@ struct _CamelImapStore {
/* Information about the server */
CamelImapServerLevel server_level;
guint32 capabilities;
- gchar dir_sep, *base_url;
+ gchar dir_sep;
GHashTable *authtypes;
time_t refresh_stamp;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]