diff options
author | Matthew Barnes <mbarnes@redhat.com> | 2010-03-20 08:32:47 +0800 |
---|---|---|
committer | Michael Meeks <michael.meeks@novell.com> | 2010-04-07 19:12:47 +0800 |
commit | 260032a9ff49e78d4081b40e5f7102d2928fc572 (patch) | |
tree | bacfca6371a7d1642f817ce1dc7f6b6f5496dc06 /modules/calendar/e-cal-shell-content.c | |
parent | ffe2f1e1ee96502cf1d3305e16f82d4063fffedc (diff) | |
download | gsoc2013-evolution-260032a9ff49e78d4081b40e5f7102d2928fc572.tar gsoc2013-evolution-260032a9ff49e78d4081b40e5f7102d2928fc572.tar.gz gsoc2013-evolution-260032a9ff49e78d4081b40e5f7102d2928fc572.tar.bz2 gsoc2013-evolution-260032a9ff49e78d4081b40e5f7102d2928fc572.tar.lz gsoc2013-evolution-260032a9ff49e78d4081b40e5f7102d2928fc572.tar.xz gsoc2013-evolution-260032a9ff49e78d4081b40e5f7102d2928fc572.tar.zst gsoc2013-evolution-260032a9ff49e78d4081b40e5f7102d2928fc572.zip |
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
Diffstat (limited to 'modules/calendar/e-cal-shell-content.c')
-rw-r--r-- | modules/calendar/e-cal-shell-content.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/modules/calendar/e-cal-shell-content.c b/modules/calendar/e-cal-shell-content.c index 6a3f8b6243..e9bba7a83b 100644 --- a/modules/calendar/e-cal-shell-content.c +++ b/modules/calendar/e-cal-shell-content.c @@ -318,7 +318,7 @@ cal_shell_content_constructed (GObject *object) ECalModel *task_model=NULL; EShell *shell; EShellContent *shell_content; - EShellSettings *shell_settings; + EShellBackend *shell_backend; EShellView *shell_view; EShellWindow *shell_window; EShellContent *foreign_content; @@ -342,7 +342,6 @@ cal_shell_content_constructed (GObject *object) shell_window = e_shell_view_get_shell_window (shell_view); shell = e_shell_window_get_shell (shell_window); - shell_settings = e_shell_get_shell_settings (shell); /* We borrow the memopad and taskpad models from the memo * and task views, loading the views if necessary. */ @@ -393,7 +392,7 @@ cal_shell_content_constructed (GObject *object) /* Add views in the order defined by GnomeCalendarViewType, such * that the notebook page number corresponds to the view type. */ - priv->calendar = gnome_calendar_new (shell_settings); + priv->calendar = gnome_calendar_new (); calendar = GNOME_CALENDAR (priv->calendar); for (ii = 0; ii < GNOME_CAL_LAST_VIEW; ii++) { |