More bug fixes.

4 files changed, 29 insertions, 4 deletions

diff --git a/mail/e-mail-paned-view.c b/mail/e-mail-paned-view.c
index 365f6c99e3..f2314e183e 100644
--- a/mail/e-mail-paned-view.c
+++ b/mail/e-mail-paned-view.c
@@ -576,7 +576,8 @@ mail_paned_view_constructed (GObject *object)
 	priv->formatter = em_format_html_display_new ();
 
 	/* Chain up to parent's constructed() method. */
-	//G_OBJECT_CLASS (parent_class)->constructed (object);
+	if (G_OBJECT_CLASS (parent_class)->constructed)
+		G_OBJECT_CLASS (parent_class)->constructed (object);
 
 	shell_content = E_MAIL_VIEW (object)->content;
 	shell_view = e_shell_content_get_shell_view (shell_content);
@@ -586,8 +587,6 @@ mail_paned_view_constructed (GObject *object)
 	web_view = em_format_html_get_web_view (
 		EM_FORMAT_HTML (priv->formatter));
 
-	e_mail_reader_init (E_MAIL_READER(object));
-
 	/* Build content widgets. */
 
 	container = GTK_WIDGET (object);
@@ -642,6 +641,8 @@ mail_paned_view_constructed (GObject *object)
 
 	/* Message list customizations. */
 
+	e_mail_reader_init_private (E_MAIL_READER(object));
+
 	reader = E_MAIL_READER (object);
 	message_list = e_mail_reader_get_message_list (reader);
 
diff --git a/mail/e-mail-reader.c b/mail/e-mail-reader.c
index 43f41c93c5..71e049bade 100644
--- a/mail/e-mail-reader.c
+++ b/mail/e-mail-reader.c
@@ -2999,6 +2999,21 @@ e_mail_reader_init (EMailReader *reader)
 }
 
 void
+e_mail_reader_init_private (EMailReader *reader)
+{
+	
+	quark_private = g_quark_from_static_string ("EMailReader-private");
+
+	g_object_set_qdata_full (
+		G_OBJECT (reader), quark_private,
+		g_slice_new0 (EMailReaderPrivate),
+		(GDestroyNotify) mail_reader_private_free);
+	g_signal_connect (
+		reader, "destroy",
+		G_CALLBACK (mail_reader_destroy), NULL);
+}
+
+void
 e_mail_reader_changed (EMailReader *reader)
 {
 	g_return_if_fail (E_IS_MAIL_READER (reader));
diff --git a/mail/e-mail-reader.h b/mail/e-mail-reader.h
index 16e5e4feb1..c58666cd27 100644
--- a/mail/e-mail-reader.h
+++ b/mail/e-mail-reader.h
@@ -108,6 +108,7 @@ struct _EMailReaderIface {
 
 GType		e_mail_reader_get_type		(void);
 void		e_mail_reader_init		(EMailReader *reader);
+void		e_mail_reader_init_private (EMailReader *reader);
 void		e_mail_reader_changed		(EMailReader *reader);
 guint32		e_mail_reader_check_state	(EMailReader *reader);
 void		e_mail_reader_update_actions	(EMailReader *reader,
diff --git a/modules/mail/e-mail-shell-content.c b/modules/mail/e-mail-shell-content.c
index 5f8081a1d5..3cdcee2d01 100644
--- a/modules/mail/e-mail-shell-content.c
+++ b/modules/mail/e-mail-shell-content.c
@@ -120,7 +120,15 @@ mail_shell_content_focus_search_results (EShellContent *shell_content)
 static GtkActionGroup *
 mail_shell_content_get_action_group (EMailReader *reader)
 {
-	return e_mail_reader_get_action_group (E_MAIL_READER(E_MAIL_SHELL_CONTENT(reader)->view));	
+	EShellContent *shell_content;
+	EShellWindow *shell_window;
+	EShellView *shell_view;
+
+	shell_content = E_SHELL_CONTENT (reader);
+	shell_view = e_shell_content_get_shell_view (shell_content);
+	shell_window = e_shell_view_get_shell_window (shell_view);
+
+	return E_SHELL_WINDOW_ACTION_GROUP_MAIL (shell_window);	
 }
 
 static EMFormatHTML *