From 260032a9ff49e78d4081b40e5f7102d2928fc572 Mon Sep 17 00:00:00 2001
From: Matthew Barnes <mbarnes@redhat.com>
Date: Sat, 20 Mar 2010 00:32:47 +0000
Subject: Add extensions to configure calender widgets.

Make ECalendarItem, ECalendarView, ECalModel, EDateEdit, EMeetingStore,
and EMeetingTimeSelector extensible and register extensions to
automatically bind every instance to the appropriate EShellSettings.

Conflicts:

	calendar/gui/gnome-cal.c
	modules/calendar/e-cal-shell-content.c
---
 calendar/gui/dialogs/task-editor.c | 13 -------------
 1 file changed, 13 deletions(-)

(limited to 'calendar/gui/dialogs/task-editor.c')

diff --git a/calendar/gui/dialogs/task-editor.c b/calendar/gui/dialogs/task-editor.c
index a3d4baec46..7aaa3c5afe 100644
--- a/calendar/gui/dialogs/task-editor.c
+++ b/calendar/gui/dialogs/task-editor.c
@@ -202,25 +202,12 @@ static void
 task_editor_constructed (GObject *object)
 {
 	TaskEditorPrivate *priv;
-	EShellSettings *shell_settings;
-	EShell *shell;
 
 	priv = TASK_EDITOR_GET_PRIVATE (object);
 
-	shell = comp_editor_get_shell (COMP_EDITOR (object));
-	shell_settings = e_shell_get_shell_settings (shell);
-
 	e_binding_new (
 		object, "client",
 		priv->model, "client");
-
-	e_binding_new (
-		shell_settings, "cal-free-busy-template",
-		priv->model, "free-busy-template");
-
-	e_binding_new (
-		shell_settings, "cal-timezone",
-		priv->model, "timezone");
 }
 
 static void
-- 
cgit v1.2.3


From bdca2cc8856b9ac65dc7805879b07383bb639494 Mon Sep 17 00:00:00 2001
From: Michael Meeks <michael.meeks@novell.com>
Date: Thu, 15 Apr 2010 13:38:57 +0100
Subject: cleanup for non-express mode

---
 calendar/gui/dialogs/task-editor.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'calendar/gui/dialogs/task-editor.c')

diff --git a/calendar/gui/dialogs/task-editor.c b/calendar/gui/dialogs/task-editor.c
index 7aaa3c5afe..7e35cbe070 100644
--- a/calendar/gui/dialogs/task-editor.c
+++ b/calendar/gui/dialogs/task-editor.c
@@ -81,8 +81,10 @@ static const gchar *ui =
 "    </menu>"
 "  </menubar>"
 "  <toolbar name='main-toolbar'>"
-"    <toolitem action='view-time-zone'/>"
-"    <toolitem action='option-status'/>"
+"    <placeholder name='content'>"
+"      <toolitem action='view-time-zone'/>"
+"      <toolitem action='option-status'/>"
+"    </placeholder>"
 "  </toolbar>"
 "</ui>";
 
-- 
cgit v1.2.3