diff options
Diffstat (limited to 'modules/calendar')
| -rw-r--r-- | modules/calendar/e-memo-shell-content.c | 5 | ||||
| -rw-r--r-- | modules/calendar/e-task-shell-content.c | 5 |
2 files changed, 8 insertions, 2 deletions
diff --git a/modules/calendar/e-memo-shell-content.c b/modules/calendar/e-memo-shell-content.c index 663920044c..cc17964f48 100644 --- a/modules/calendar/e-memo-shell-content.c +++ b/modules/calendar/e-memo-shell-content.c @@ -546,9 +546,12 @@ memo_shell_content_constructed (GObject *object) view_instance, "display-view", G_CALLBACK (memo_shell_content_display_view_cb), object); - gal_view_instance_load (view_instance); priv->view_instance = view_instance; + /* Do this last so e_memo_shell_content_get_view_instance() returns + * the correct instance in GalViewInstance::loaded signal handlers. */ + gal_view_instance_load (view_instance); + /* Restore pane positions from the last session once * the shell view is fully initialized and visible. */ g_signal_connect ( diff --git a/modules/calendar/e-task-shell-content.c b/modules/calendar/e-task-shell-content.c index bb2017fa8a..6b3f23eeb0 100644 --- a/modules/calendar/e-task-shell-content.c +++ b/modules/calendar/e-task-shell-content.c @@ -541,9 +541,12 @@ task_shell_content_constructed (GObject *object) view_instance, "display-view", G_CALLBACK (task_shell_content_display_view_cb), object); - gal_view_instance_load (view_instance); priv->view_instance = view_instance; + /* Do this last so e_task_shell_content_get_view_instance() returns + * the correct instance in GalViewInstance::loaded signal handlers. */ + gal_view_instance_load (view_instance); + /* Restore pane positions from the last session once * the shell view is fully initialized and visible. */ g_signal_connect ( |