aboutsummaryrefslogtreecommitdiffstats
path: root/calendar/gui
diff options
context:
space:
mode:
Diffstat (limited to 'calendar/gui')
-rw-r--r--calendar/gui/e-calendar-view.c12
-rw-r--r--calendar/gui/e-day-view.c3
-rw-r--r--calendar/gui/e-week-view.c3
3 files changed, 16 insertions, 2 deletions
diff --git a/calendar/gui/e-calendar-view.c b/calendar/gui/e-calendar-view.c
index d41ef007a4..d99de8ae50 100644
--- a/calendar/gui/e-calendar-view.c
+++ b/calendar/gui/e-calendar-view.c
@@ -341,6 +341,15 @@ calendar_view_finalize (GObject *object)
}
static void
+calendar_view_constructed (GObject *object)
+{
+ /* Do this after calendar_view_init() so extensions can query
+ * the GType accurately. See GInstanceInitFunc documentation
+ * for details of the problem. */
+ e_extensible_load_extensions (E_EXTENSIBLE (object));
+}
+
+static void
calendar_view_update_actions (ESelectable *selectable,
EFocusTracker *focus_tracker,
GdkAtom *clipboard_targets,
@@ -736,6 +745,7 @@ e_calendar_view_class_init (ECalendarViewClass *class)
object_class->get_property = calendar_view_get_property;
object_class->dispose = calendar_view_dispose;
object_class->finalize = calendar_view_finalize;
+ object_class->constructed = calendar_view_constructed;
class->selection_changed = NULL;
class->selected_time_changed = NULL;
@@ -876,8 +886,6 @@ e_calendar_view_init (ECalendarView *calendar_view)
target_list = gtk_target_list_new (NULL, 0);
e_target_list_add_calendar_targets (target_list, 0);
calendar_view->priv->paste_target_list = target_list;
-
- e_extensible_load_extensions (E_EXTENSIBLE (calendar_view));
}
static void
diff --git a/calendar/gui/e-day-view.c b/calendar/gui/e-day-view.c
index cbc71b969c..477068800d 100644
--- a/calendar/gui/e-day-view.c
+++ b/calendar/gui/e-day-view.c
@@ -591,6 +591,9 @@ day_view_constructed (GObject *object)
{
ECalModel *model;
+ /* Chain up to parent's constructed() method. */
+ G_OBJECT_CLASS (e_day_view_parent_class)->constructed (object);
+
model = e_calendar_view_get_model (E_CALENDAR_VIEW (object));
g_signal_connect_swapped (
diff --git a/calendar/gui/e-week-view.c b/calendar/gui/e-week-view.c
index 23cc8e6654..d41a686a79 100644
--- a/calendar/gui/e-week-view.c
+++ b/calendar/gui/e-week-view.c
@@ -523,6 +523,9 @@ week_view_constructed (GObject *object)
ECalModel *model;
ECalendarView *calendar_view;
+ /* Chain up to parent's constructed() method. */
+ G_OBJECT_CLASS (e_week_view_parent_class)->constructed (object);
+
calendar_view = E_CALENDAR_VIEW (object);
model = e_calendar_view_get_model (calendar_view);