aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--calendar/gui/e-cal-model.c5
-rw-r--r--modules/calendar/e-cal-shell-view-private.c2
2 files changed, 5 insertions, 2 deletions
diff --git a/calendar/gui/e-cal-model.c b/calendar/gui/e-cal-model.c
index cf515d55b6..33c209e1c5 100644
--- a/calendar/gui/e-cal-model.c
+++ b/calendar/gui/e-cal-model.c
@@ -2130,6 +2130,11 @@ add_new_client (ECalModel *model, ECal *client, gboolean do_query)
/* Look to see if we already have this client */
client_data = find_client_data (model, client);
if (client_data) {
+ if (do_query && client_data->client == priv->default_client) {
+ g_warning ("%s: %s: You shouldn't request a query on a default client", G_STRLOC, G_STRFUNC);
+ return client_data;
+ }
+
if (client_data->do_query)
return client_data;
else
diff --git a/modules/calendar/e-cal-shell-view-private.c b/modules/calendar/e-cal-shell-view-private.c
index 89d8ef5ba9..8a7e3766e3 100644
--- a/modules/calendar/e-cal-shell-view-private.c
+++ b/modules/calendar/e-cal-shell-view-private.c
@@ -328,8 +328,6 @@ cal_shell_view_user_created_cb (ECalShellView *cal_shell_view,
cal_shell_sidebar = cal_shell_view->priv->cal_shell_sidebar;
e_cal_shell_sidebar_add_source (cal_shell_sidebar, source);
-
- e_cal_model_add_client (model, client);
}
static void