4 files changed, 4 insertions, 16 deletions
diff --git a/calendar/gui/dialogs/event-page.c b/calendar/gui/dialogs/event-page.c
index 3f30617be6..81d5878932 100644
--- a/calendar/gui/dialogs/event-page.c
+++ b/calendar/gui/dialogs/event-page.c
@@ -2562,8 +2562,8 @@ source_changed_cb (ESourceComboBox *source_combo_box, EventPage *epage)
 		return;
 
 	editor = comp_editor_page_get_editor (COMP_EDITOR_PAGE (epage));
-	client = auth_new_cal_from_source (source, E_CAL_SOURCE_TYPE_EVENT);
 	source = e_source_combo_box_get_active (source_combo_box);
+	client = auth_new_cal_from_source (source, E_CAL_SOURCE_TYPE_EVENT);
 
 	if (client) {
 		icaltimezone *zone;
diff --git a/calendar/gui/dialogs/memo-page.c b/calendar/gui/dialogs/memo-page.c
index 9f3e5d85d4..b8822cee15 100644
--- a/calendar/gui/dialogs/memo-page.c
+++ b/calendar/gui/dialogs/memo-page.c
@@ -826,8 +826,8 @@ source_changed_cb (ESourceComboBox *source_combo_box,
 	editor = comp_editor_page_get_editor (COMP_EDITOR_PAGE (mpage));
 	flags = comp_editor_get_flags (editor);
 
-	client = auth_new_cal_from_source (source, E_CAL_SOURCE_TYPE_JOURNAL);
 	source = e_source_combo_box_get_active (source_combo_box);
+	client = auth_new_cal_from_source (source, E_CAL_SOURCE_TYPE_JOURNAL);
 
 	if (!client || !e_cal_open (client, FALSE, NULL)) {
 		GtkWidget *dialog;
diff --git a/calendar/gui/e-cal-model.c b/calendar/gui/e-cal-model.c
index ce34884c34..818015cade 100644
--- a/calendar/gui/e-cal-model.c
+++ b/calendar/gui/e-cal-model.c
@@ -1115,7 +1115,6 @@ void
 e_cal_model_set_timezone (ECalModel *model, icaltimezone *zone)
 {
 	ECalModelPrivate *priv;
-	GList *l;
 
 	g_return_if_fail (E_IS_CAL_MODEL (model));
 
@@ -1522,7 +1521,6 @@ e_cal_view_done_cb (ECalView *query, ECalendarStatus status, gpointer user_data)
 {
  	ECalModel *model = (ECalModel *) user_data;
 	ECal *client = e_cal_view_get_client (query);
-	ECalModelPrivate *priv = model->priv;
 
 	g_return_if_fail (E_IS_CAL_MODEL (model));
 
@@ -2088,6 +2086,7 @@ e_cal_model_date_value_to_string (ECalModel *model, const void *value)
 	return g_strdup (buffer);
 }
 
+/* FIXME is it still needed ?
 static ECellDateEditValue *
 copy_ecdv (ECellDateEditValue *ecdv)
 {
@@ -2098,7 +2097,7 @@ copy_ecdv (ECellDateEditValue *ecdv)
 	new_ecdv->zone = ecdv ? ecdv->zone : NULL;
 
 	return new_ecdv;
-}
+} */
 
 
 struct _ECalModelComponentPrivate {
diff --git a/calendar/gui/e-day-view-config.c b/calendar/gui/e-day-view-config.c
index 0e961eeda8..f11212f896 100644
--- a/calendar/gui/e-day-view-config.c
+++ b/calendar/gui/e-day-view-config.c
@@ -145,17 +145,6 @@ e_day_view_config_get_view (EDayViewConfig *view_config)
 }
 
 static void
-timezone_changed_cb (GConfClient *client, guint id, GConfEntry *entry, gpointer data)
-{
-	EDayViewConfig *view_config = data;
-	EDayViewConfigPrivate *priv;
-
-	priv = view_config->priv;
-
-	set_timezone (priv->view);
-}
-
-static void
 set_week_start (EDayView *day_view)
 {
 	int week_start_day;