From 31b57ed0383b2ea225195d4b72a872f7f2d93163 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Mon, 20 Sep 2010 23:13:43 -0400 Subject: Adapt to Camel API changes. --- plugins/groupwise-features/install-shared.c | 7 ++++--- plugins/groupwise-features/proxy.c | 2 +- plugins/groupwise-features/share-folder-common.c | 4 ++-- plugins/groupwise-features/status-track.c | 2 +- 4 files changed, 8 insertions(+), 7 deletions(-) (limited to 'plugins/groupwise-features') diff --git a/plugins/groupwise-features/install-shared.c b/plugins/groupwise-features/install-shared.c index b753653229..92d5ae6aab 100644 --- a/plugins/groupwise-features/install-shared.c +++ b/plugins/groupwise-features/install-shared.c @@ -104,7 +104,8 @@ install_folder_response (EMFolderSelector *emfs, gint response, gpointer *data) if (e_gw_connection_accept_shared_folder (cnc, folder_name, container_id, (gchar *)item_id, NULL) == E_GW_CONNECTION_STATUS_OK) { /* FIXME Not passing a GCancellable or GError here. */ - folder = camel_store_get_folder (store, "Mailbox", 0, NULL, NULL); + folder = camel_store_get_folder_sync ( + store, "Mailbox", 0, NULL, NULL); /*changes = camel_folder_change_info_new (); camel_folder_change_info_remove_uid (changes, (gchar *) item_id); camel_folder_summary_remove_uid (folder->summary, item_id);*/ @@ -210,8 +211,8 @@ org_gnome_popup_wizard (EPlugin *ep, EMEventTargetMessage *target) byte_array = g_byte_array_new (); stream = camel_stream_mem_new_with_byte_array (byte_array); - camel_data_wrapper_write_to_stream (dw, stream, NULL); - camel_stream_write (stream, "", 1, NULL); + camel_data_wrapper_write_to_stream_sync (dw, stream, NULL, NULL); + camel_stream_write (stream, "", 1, NULL, NULL); from_addr = camel_mime_message_get_from ((CamelMimeMessage *)target->message); if (from_addr && camel_internet_address_get (from_addr, 0, &name, &email)) { diff --git a/plugins/groupwise-features/proxy.c b/plugins/groupwise-features/proxy.c index 5a01a6c281..beb1c94b30 100644 --- a/plugins/groupwise-features/proxy.c +++ b/plugins/groupwise-features/proxy.c @@ -664,7 +664,7 @@ org_gnome_proxy (EPlugin *epl, EConfigHookItemFactoryData *data) priv->builder_tab = gtk_builder_new (); e_load_ui_builder_definition (priv->builder_tab, "proxy-listing.ui"); - if (account->enabled && (store->state == CAMEL_OFFLINE_STORE_NETWORK_AVAIL)) { + if (account->enabled && camel_offline_store_get_online (store)) { priv->tab_dialog = GTK_WIDGET (e_builder_get_widget (priv->builder_tab, "proxy_vbox")); priv->tree = GTK_TREE_VIEW (e_builder_get_widget (priv->builder_tab, "proxy_access_list")); priv->store = gtk_tree_store_new (2, diff --git a/plugins/groupwise-features/share-folder-common.c b/plugins/groupwise-features/share-folder-common.c index 9a345f1ba6..e4d8dc30c7 100644 --- a/plugins/groupwise-features/share-folder-common.c +++ b/plugins/groupwise-features/share-folder-common.c @@ -142,12 +142,12 @@ create_folder_exec (struct _EMCreateFolder *m) { d(printf ("creating folder parent='%s' name='%s' full_name='%s'\n", m->parent, m->name, m->full_name)); - if ((m->fi = camel_store_create_folder ( + if ((m->fi = camel_store_create_folder_sync ( m->store, m->parent, m->name, m->base.cancellable, &m->base.error))) { if (camel_store_supports_subscriptions (m->store)) - camel_store_subscribe_folder ( + camel_store_subscribe_folder_sync ( m->store, m->full_name, m->base.cancellable, &m->base.error); } diff --git a/plugins/groupwise-features/status-track.c b/plugins/groupwise-features/status-track.c index 61c1ac25f0..f964c643ee 100644 --- a/plugins/groupwise-features/status-track.c +++ b/plugins/groupwise-features/status-track.c @@ -74,7 +74,7 @@ get_selected_message (EShellView *shell_view, *selected_uid = g_strdup (g_ptr_array_index (uids, 0)); /* FIXME Not passing a GCancellable or GError here. */ - msg = camel_folder_get_message ( + msg = camel_folder_get_message_sync ( *folder, *selected_uid, NULL, NULL); } -- cgit v1.2.3