3 files changed, 30 insertions, 39 deletions

diff --git a/modules/calendar/e-cal-shell-view-actions.c b/modules/calendar/e-cal-shell-view-actions.c
index f9fdf1caf1..9a54b0603f 100644
--- a/modules/calendar/e-cal-shell-view-actions.c
+++ b/modules/calendar/e-cal-shell-view-actions.c
@@ -371,32 +371,29 @@ static void
 action_calendar_refresh_cb (GtkAction *action,
                            ECalShellView *cal_shell_view)
 {
-	ECalShellContent *cal_shell_content;
 	ECalShellSidebar *cal_shell_sidebar;
 	ESourceSelector *selector;
-	ECalClient *client;
-	ECalModel *model;
+	EClient *client = NULL;
 	ESource *source;
 	GError *error = NULL;
 
-	cal_shell_content = cal_shell_view->priv->cal_shell_content;
 	cal_shell_sidebar = cal_shell_view->priv->cal_shell_sidebar;
-
-	model = e_cal_shell_content_get_model (cal_shell_content);
 	selector = e_cal_shell_sidebar_get_selector (cal_shell_sidebar);
 
 	source = e_source_selector_ref_primary_selection (selector);
-	g_return_if_fail (source != NULL);
 
-	client = e_cal_model_get_client_for_source (model, source);
-	if (client == NULL) {
+	if (source != NULL) {
+		client = e_client_selector_ref_cached_client (
+			E_CLIENT_SELECTOR (selector), source);
 		g_object_unref (source);
-		return;
 	}
 
-	g_return_if_fail (e_client_check_refresh_supported (E_CLIENT (client)));
+	if (client == NULL)
+		return;
 
-	e_client_refresh_sync (E_CLIENT (client), NULL, &error);
+	g_return_if_fail (e_client_check_refresh_supported (client));
+
+	e_client_refresh_sync (client, NULL, &error);
 
 	if (error != NULL) {
 		g_warning (
@@ -406,7 +403,7 @@ action_calendar_refresh_cb (GtkAction *action,
 		g_error_free (error);
 	}
 
-	g_object_unref (source);
+	g_object_unref (client);
 }
 
 static void
diff --git a/modules/calendar/e-memo-shell-view-actions.c b/modules/calendar/e-memo-shell-view-actions.c
index 0e0d28e885..5e30e24fcf 100644
--- a/modules/calendar/e-memo-shell-view-actions.c
+++ b/modules/calendar/e-memo-shell-view-actions.c
@@ -294,32 +294,29 @@ static void
 action_memo_list_refresh_cb (GtkAction *action,
                              EMemoShellView *memo_shell_view)
 {
-	EMemoShellContent *memo_shell_content;
 	EMemoShellSidebar *memo_shell_sidebar;
 	ESourceSelector *selector;
-	ECalClient *client;
-	ECalModel *model;
+	EClient *client = NULL;
 	ESource *source;
 	GError *error = NULL;
 
-	memo_shell_content = memo_shell_view->priv->memo_shell_content;
 	memo_shell_sidebar = memo_shell_view->priv->memo_shell_sidebar;
-
-	model = e_memo_shell_content_get_memo_model (memo_shell_content);
 	selector = e_memo_shell_sidebar_get_selector (memo_shell_sidebar);
 
 	source = e_source_selector_ref_primary_selection (selector);
-	g_return_if_fail (source != NULL);
 
-	client = e_cal_model_get_client_for_source (model, source);
-	if (client == NULL) {
+	if (source != NULL) {
+		client = e_client_selector_ref_cached_client (
+			E_CLIENT_SELECTOR (selector), source);
 		g_object_unref (source);
-		return;
 	}
 
-	g_return_if_fail (e_client_check_refresh_supported (E_CLIENT (client)));
+	if (client == NULL)
+		return;
 
-	e_client_refresh_sync (E_CLIENT (client), NULL, &error);
+	g_return_if_fail (e_client_check_refresh_supported (client));
+
+	e_client_refresh_sync (client, NULL, &error);
 
 	if (error != NULL) {
 		g_warning (
@@ -329,7 +326,7 @@ action_memo_list_refresh_cb (GtkAction *action,
 		g_error_free (error);
 	}
 
-	g_object_unref (source);
+	g_object_unref (client);
 }
 
 static void
diff --git a/modules/calendar/e-task-shell-view-actions.c b/modules/calendar/e-task-shell-view-actions.c
index 6709a6e7d7..0c3ab2e040 100644
--- a/modules/calendar/e-task-shell-view-actions.c
+++ b/modules/calendar/e-task-shell-view-actions.c
@@ -317,32 +317,29 @@ static void
 action_task_list_refresh_cb (GtkAction *action,
                              ETaskShellView *task_shell_view)
 {
-	ETaskShellContent *task_shell_content;
 	ETaskShellSidebar *task_shell_sidebar;
 	ESourceSelector *selector;
-	ECalClient *client;
-	ECalModel *model;
+	EClient *client = NULL;
 	ESource *source;
 	GError *error = NULL;
 
-	task_shell_content = task_shell_view->priv->task_shell_content;
 	task_shell_sidebar = task_shell_view->priv->task_shell_sidebar;
-
-	model = e_task_shell_content_get_task_model (task_shell_content);
 	selector = e_task_shell_sidebar_get_selector (task_shell_sidebar);
 
 	source = e_source_selector_ref_primary_selection (selector);
-	g_return_if_fail (source != NULL);
 
-	client = e_cal_model_get_client_for_source (model, source);
-	if (client == NULL) {
+	if (source != NULL) {
+		client = e_client_selector_ref_cached_client (
+			E_CLIENT_SELECTOR (selector), source);
 		g_object_unref (source);
-		return;
 	}
 
-	g_return_if_fail (e_client_check_refresh_supported (E_CLIENT (client)));
+	if (client == NULL)
+		return;
 
-	e_client_refresh_sync (E_CLIENT (client), NULL, &error);
+	g_return_if_fail (e_client_check_refresh_supported (client));
+
+	e_client_refresh_sync (client, NULL, &error);
 
 	if (error != NULL) {
 		g_warning (
@@ -352,7 +349,7 @@ action_task_list_refresh_cb (GtkAction *action,
 		g_error_free (error);
 	}
 
-	g_object_unref (source);
+	g_object_unref (client);
 }
 
 static void