1 files changed, 39 insertions, 12 deletions

diff --git a/calendar/gui/dialogs/recurrence-page.c b/calendar/gui/dialogs/recurrence-page.c
index 385b4eeea0..ca53a41737 100644
--- a/calendar/gui/dialogs/recurrence-page.c
+++ b/calendar/gui/dialogs/recurrence-page.c
@@ -34,6 +34,7 @@
 #include <glib/gi18n.h>
 #include <glade/glade.h>
 #include <libedataserver/e-time-utils.h>
+#include <e-util/e-binding.h>
 #include <e-util/e-dialog-widgets.h>
 #include <e-util/e-util-private.h>
 #include <misc/e-dateedit.h>
@@ -44,7 +45,6 @@
 #include "../weekday-picker.h"
 #include "comp-editor-util.h"
 #include "../e-date-time-list.h"
-#include "../e-mini-calendar-config.h"
 #include "recurrence-page.h"
 
 #define RECURRENCE_PAGE_GET_PRIVATE(obj) \
@@ -188,7 +188,6 @@ struct _RecurrencePagePrivate {
 
 	/* For the recurrence preview, the actual widget */
 	GtkWidget *preview_calendar;
-	EMiniCalendarConfig *preview_calendar_config;
 };
 
 
@@ -323,11 +322,6 @@ recurrence_page_dispose (GObject *object)
 		priv->exception_list_store = NULL;
 	}
 
-	if (priv->preview_calendar_config != NULL) {
-		g_object_unref (priv->preview_calendar_config);
-		priv->preview_calendar_config = NULL;
-	}
-
 	/* Chain up to parent's dispose() method. */
 	G_OBJECT_CLASS (recurrence_page_parent_class)->dispose (object);
 }
@@ -1338,6 +1332,8 @@ static void
 make_ending_until_special (RecurrencePage *rpage)
 {
 	RecurrencePagePrivate *priv = rpage->priv;
+	EShell *shell;
+	EShellSettings *shell_settings;
 	CompEditor *editor;
 	CompEditorFlags flags;
 	EDateEdit *de;
@@ -1349,10 +1345,13 @@ make_ending_until_special (RecurrencePage *rpage)
 	editor = comp_editor_page_get_editor (COMP_EDITOR_PAGE (rpage));
 	flags = comp_editor_get_flags (editor);
 
+	shell = comp_editor_get_shell (editor);
+	shell_settings = e_shell_get_shell_settings (shell);
+
 	/* Create the widget */
 
-	priv->ending_date_edit = comp_editor_new_date_edit (TRUE, FALSE,
-							    FALSE);
+	priv->ending_date_edit = comp_editor_new_date_edit (
+		shell_settings, TRUE, FALSE, FALSE);
 	de = E_DATE_EDIT (priv->ending_date_edit);
 
 	gtk_container_add (GTK_CONTAINER (priv->ending_special),
@@ -2077,9 +2076,16 @@ create_exception_dialog (RecurrencePage *rpage, const gchar *title, GtkWidget **
 {
 	RecurrencePagePrivate *priv;
 	GtkWidget *dialog, *toplevel;
+	CompEditor *editor;
+	EShell *shell;
+	EShellSettings *shell_settings;
 
 	priv = rpage->priv;
 
+	editor = comp_editor_page_get_editor (COMP_EDITOR_PAGE (rpage));
+	shell = comp_editor_get_shell (editor);
+	shell_settings = e_shell_get_shell_settings (shell);
+
 	toplevel = gtk_widget_get_toplevel (priv->main);
 	dialog = gtk_dialog_new_with_buttons (title, GTK_WINDOW (toplevel),
 					      GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
@@ -2087,7 +2093,7 @@ create_exception_dialog (RecurrencePage *rpage, const gchar *title, GtkWidget **
 					      GTK_STOCK_OK, GTK_RESPONSE_ACCEPT,
 					      NULL);
 
-	*date_edit = comp_editor_new_date_edit (TRUE, FALSE, TRUE);
+	*date_edit = comp_editor_new_date_edit (shell_settings, TRUE, FALSE, TRUE);
 	gtk_widget_show (*date_edit);
 	gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), *date_edit, FALSE, TRUE, 6);
 
@@ -2243,6 +2249,9 @@ static void
 init_widgets (RecurrencePage *rpage)
 {
 	RecurrencePagePrivate *priv;
+	EShell *shell;
+	EShellSettings *shell_settings;
+	CompEditor *editor;
 	ECalendar *ecal;
 	GtkAdjustment *adj;
 	GtkTreeViewColumn *column;
@@ -2250,11 +2259,23 @@ init_widgets (RecurrencePage *rpage)
 
 	priv = rpage->priv;
 
+	editor = comp_editor_page_get_editor (COMP_EDITOR_PAGE (rpage));
+	shell = comp_editor_get_shell (editor);
+	shell_settings = e_shell_get_shell_settings (shell);
+
 	/* Recurrence preview */
 
 	priv->preview_calendar = e_calendar_new ();
 	ecal = E_CALENDAR (priv->preview_calendar);
-	priv->preview_calendar_config = e_mini_calendar_config_new (ecal);
+
+	e_binding_new (
+		G_OBJECT (shell_settings), "cal-show-week-numbers",
+		G_OBJECT (ecal->calitem), "show-week-numbers");
+
+	e_binding_new (
+		G_OBJECT (shell_settings), "cal-week-start-day",
+		G_OBJECT (ecal->calitem), "week-start-day");
+
 	g_signal_connect((ecal->calitem), "date_range_changed",
 			    G_CALLBACK (preview_date_range_changed_cb),
 			    rpage);
@@ -2401,6 +2422,12 @@ GtkWidget *make_exdate_date_edit (void);
 GtkWidget *
 make_exdate_date_edit (void)
 {
-	return comp_editor_new_date_edit (TRUE, TRUE, FALSE);
+	EShell *shell;
+	EShellSettings *shell_settings;
+
+	shell = e_shell_get_default ();
+	shell_settings = e_shell_get_shell_settings (shell);
+
+	return comp_editor_new_date_edit (shell_settings, TRUE, TRUE, FALSE);
 }