aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--modules/mail/e-mail-shell-content.c2
-rw-r--r--modules/mail/e-mail-shell-view-private.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/modules/mail/e-mail-shell-content.c b/modules/mail/e-mail-shell-content.c
index 20c9df7a29..0f4a9335a1 100644
--- a/modules/mail/e-mail-shell-content.c
+++ b/modules/mail/e-mail-shell-content.c
@@ -1018,7 +1018,7 @@ e_mail_shell_content_update_view_instance (EMailShellContent *mail_shell_content
g_free (state_filename);
}
- g_signal_connect (
+ g_signal_connect_swapped (
view_instance, "display-view",
G_CALLBACK (mail_shell_content_display_view_cb),
mail_shell_content);
diff --git a/modules/mail/e-mail-shell-view-private.c b/modules/mail/e-mail-shell-view-private.c
index 7e27aaa950..067900b5c2 100644
--- a/modules/mail/e-mail-shell-view-private.c
+++ b/modules/mail/e-mail-shell-view-private.c
@@ -271,7 +271,7 @@ mail_shell_view_notify_view_id_cb (EMailShellView *mail_shell_view)
const gchar *view_id;
mail_shell_content = mail_shell_view->priv->mail_shell_content;
- view_instance = NULL; /* FIXME */
+ view_instance = e_mail_shell_content_get_view_instance (mail_shell_content);
view_id = e_shell_view_get_view_id (E_SHELL_VIEW (mail_shell_view));
/* A NULL view ID implies we're in a custom view. But you can