Adapt to Camel API changes.

4 files changed, 15 insertions, 11 deletions

diff --git a/plugins/groupwise-features/junk-mail-settings.c b/plugins/groupwise-features/junk-mail-settings.c
index 192b4f2b0d..6e72b67320 100644
--- a/plugins/groupwise-features/junk-mail-settings.c
+++ b/plugins/groupwise-features/junk-mail-settings.c
@@ -77,7 +77,7 @@ gw_junk_mail_settings_cb (GtkAction *action, EShellView *shell_view)
 	folder = e_mail_reader_get_folder (reader);
 	g_return_if_fail (folder != NULL);
 
-	cnc = get_cnc (folder->parent_store);
+	cnc = get_cnc (camel_folder_get_parent_store (folder));
 
 	dialog =  gtk_dialog_new_with_buttons (_("Junk Settings"),
 			NULL,
diff --git a/plugins/groupwise-features/mail-retract.c b/plugins/groupwise-features/mail-retract.c
index 69b9acd5f0..466da1cb23 100644
--- a/plugins/groupwise-features/mail-retract.c
+++ b/plugins/groupwise-features/mail-retract.c
@@ -63,7 +63,7 @@ gw_retract_mail_cb (GtkAction *action, EShellView *shell_view)
 {
 	EGwConnection *cnc;
 	CamelFolder *folder;
-	CamelStore *store;
+	CamelStore *parent_store;
 	gchar *id = NULL;
 	GtkWidget *confirm_dialog, *confirm_warning;
 	GtkWidget *content_area;
@@ -72,9 +72,9 @@ gw_retract_mail_cb (GtkAction *action, EShellView *shell_view)
 	g_return_if_fail (get_selected_info (shell_view, &folder, &id));
 	g_return_if_fail (folder != NULL);
 
-	store = folder->parent_store;
+	parent_store = camel_folder_get_parent_store (folder);
 
-	cnc = get_cnc (store);
+	cnc = get_cnc (parent_store);
 
 	if (cnc && E_IS_GW_CONNECTION(cnc)) {
 		confirm_dialog = gtk_dialog_new_with_buttons (
diff --git a/plugins/groupwise-features/share-folder-common.c b/plugins/groupwise-features/share-folder-common.c
index 10e9b341dc..91758da535 100644
--- a/plugins/groupwise-features/share-folder-common.c
+++ b/plugins/groupwise-features/share-folder-common.c
@@ -93,12 +93,14 @@ void
 shared_folder_commit (EPlugin *ep, EConfigTarget *tget)
 {
 	EMConfigTargetFolder *target =  (EMConfigTargetFolder *)tget->config->target;
-	CamelFolder *folder = target->folder;
-	CamelStore *store = folder->parent_store;
+	CamelStore *parent_store;
 	EMFolderTreeModel *model = NULL; /*mail_component_peek_tree_model (mail_component_peek ())*/;
+
+	parent_store = camel_folder_get_parent_store (target->folder);
+
 	if (common) {
 		share_folder (common);
-		refresh_folder_tree (model, store);
+		refresh_folder_tree (model, parent_store);
 		g_object_run_dispose ((GObject *)common);
 		common = NULL;
 	}
@@ -370,7 +372,7 @@ org_gnome_shared_folder_factory (EPlugin *ep, EConfigHookItemFactoryData *hook_d
 	EMConfigTargetFolder *target=  (EMConfigTargetFolder *)hook_data->config->target;
 	CamelFolder *folder = target->folder;
 
-	folder_name = g_strdup (folder->full_name);
+	folder_name = g_strdup (camel_folder_get_full_name (folder));
 	folderuri = g_strdup(target->uri);
 	if (folderuri && folder_name)
 		account = g_strrstr(folderuri, "groupwise");
@@ -396,8 +398,10 @@ org_gnome_shared_folder_factory (EPlugin *ep, EConfigHookItemFactoryData *hook_d
 	}
 
 	if (account) {
-		CamelStore *store = folder->parent_store;
-		cnc = get_cnc (store);
+		CamelStore *parent_store;
+
+		parent_store = camel_folder_get_parent_store (folder);
+		cnc = get_cnc (parent_store);
 
 		if (E_IS_GW_CONNECTION (cnc))
 			id = get_container_id (cnc, folder_name);
diff --git a/plugins/groupwise-features/status-track.c b/plugins/groupwise-features/status-track.c
index 0243e1e453..83ecf6c1bf 100644
--- a/plugins/groupwise-features/status-track.c
+++ b/plugins/groupwise-features/status-track.c
@@ -184,7 +184,7 @@ gw_track_message_status_cb (GtkAction *action,
 	gtk_table_set_col_spacings (table ,12);
 	gtk_table_set_row_spacings (table, 6);
 	gtk_box_pack_start (GTK_BOX (vbox), GTK_WIDGET (table), FALSE, TRUE, 0);
-	cnc = get_cnc (folder->parent_store);
+	cnc = get_cnc (camel_folder_get_parent_store (folder));
 
 	if (E_IS_GW_CONNECTION(cnc)) {
 		GSList *recipient_list;