diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2011-04-18 01:13:55 +0800 |
|---|---|---|
| committer | Rodrigo Moya <rodrigo@gnome-db.org> | 2011-06-30 00:41:55 +0800 |
| commit | f31b492945408f038ae16a099900631ae9714912 (patch) | |
| tree | 031f02a545f2f540048ee1fe7a8180fb10d9dd0a /plugins/groupwise-features | |
| parent | a6dbbf97cac0e702d9de86b4defabcbe22e12cf3 (diff) | |
| download | gsoc2013-evolution-f31b492945408f038ae16a099900631ae9714912.tar.gz gsoc2013-evolution-f31b492945408f038ae16a099900631ae9714912.tar.zst gsoc2013-evolution-f31b492945408f038ae16a099900631ae9714912.zip | |
Adapt to sealed up CamelService.
Diffstat (limited to 'plugins/groupwise-features')
| -rw-r--r-- | plugins/groupwise-features/install-shared.c | 6 | ||||
| -rw-r--r-- | plugins/groupwise-features/share-folder-common.c | 11 |
2 files changed, 12 insertions, 5 deletions
diff --git a/plugins/groupwise-features/install-shared.c b/plugins/groupwise-features/install-shared.c index 0a7cd1ace5..969ea0c30d 100644 --- a/plugins/groupwise-features/install-shared.c +++ b/plugins/groupwise-features/install-shared.c @@ -103,6 +103,8 @@ install_folder_response (EMFolderSelector *emfs, gint response, gpointer *data) container_id = get_container_id (cnc, parent_name); if (e_gw_connection_accept_shared_folder (cnc, folder_name, container_id, (gchar *)item_id, NULL) == E_GW_CONNECTION_STATUS_OK) { + CamelService *service; + CamelURL *url; /* FIXME Not passing a GCancellable or GError here. */ folder = camel_store_get_folder_sync ( @@ -117,7 +119,9 @@ install_folder_response (EMFolderSelector *emfs, gint response, gpointer *data) CAMEL_MESSAGE_DELETED); camel_folder_summary_touch (folder->summary); /* camel_object_trigger_event (CAMEL_OBJECT (folder), "folder_changed", changes); */ - uri = camel_url_to_string (((CamelService *) store)->url, CAMEL_URL_HIDE_ALL); + service = CAMEL_SERVICE (store); + url = camel_service_get_camel_url (service); + uri = camel_url_to_string (url, CAMEL_URL_HIDE_ALL); account = e_get_account_by_source_url (uri); uri = account->source->url; em_folder_tree_model_remove_store (model, store); diff --git a/plugins/groupwise-features/share-folder-common.c b/plugins/groupwise-features/share-folder-common.c index 790edb4d8a..521bd3a54c 100644 --- a/plugins/groupwise-features/share-folder-common.c +++ b/plugins/groupwise-features/share-folder-common.c @@ -69,8 +69,11 @@ refresh_folder_tree (EMFolderTreeModel *model, CamelStore *store) gchar *uri; EAccount *account; CamelProvider *provider; + CamelURL *url; + + url = camel_service_get_camel_url (CAMEL_SERVICE (store)); + uri = camel_url_to_string (url, CAMEL_URL_HIDE_ALL); - uri = camel_url_to_string (((CamelService *) store)->url, CAMEL_URL_HIDE_ALL); account = e_get_account_by_source_url (uri); if (!account) { return; @@ -436,7 +439,7 @@ get_cnc (CamelStore *store) return NULL; service = CAMEL_SERVICE (store); - url = service->url; + url = camel_service_get_camel_url (service); server_name = g_strdup (url->host); user = g_strdup (url->user); property_value = camel_url_get_param (url, "soap_port"); @@ -453,10 +456,10 @@ get_cnc (CamelStore *store) else uri = g_strconcat ("http://", server_name, ":", port, "/soap", NULL); - cnc = e_gw_connection_new (uri, user, service->url->passwd); + cnc = e_gw_connection_new (uri, user, url->passwd); if (!E_IS_GW_CONNECTION(cnc) && use_ssl && g_str_equal (use_ssl, "when-possible")) { gchar *http_uri = g_strconcat ("http://", uri + 8, NULL); - cnc = e_gw_connection_new (http_uri, user, service->url->passwd); + cnc = e_gw_connection_new (http_uri, user, url->passwd); g_free (http_uri); } g_free (use_ssl); |