[evolution/webkit: 31/96] Don't destroy widgets already destroyed when parent widgets was destroyed.

[Dan VrÃtil <dvratil src gnome org>]

commit 9514d008e720d3bfdf92a7c320539800caed014a
Author: Dan VrÃtil <dvratil redhat com>
Date:   Thu Sep 22 12:52:23 2011 +0200

    Don't destroy widgets already destroyed when parent widgets was destroyed.
    
    Fixes warning when clearing EMailDisplay and crash when closing Evolution.

 mail/e-mail-display.c    |    4 ----
 mail/e-mail-paned-view.c |    5 -----
 2 files changed, 0 insertions(+), 9 deletions(-)
---
diff --git a/mail/e-mail-display.c b/mail/e-mail-display.c
index 18cd6da..d6cd8dd 100644
--- a/mail/e-mail-display.c
+++ b/mail/e-mail-display.c
@@ -746,10 +746,6 @@ remove_widget (GtkWidget *widget, gpointer user_data)
 		return;
 
 	gtk_container_remove  (GTK_CONTAINER (display->priv->vbox), widget);
-
-	/* We must not destroy attachment bar, it's owned by EMFormatHTMLDisplay */
-	if  (!E_IS_ATTACHMENT_VIEW (widget))
-		gtk_widget_destroy (widget);
 }
 
 void
diff --git a/mail/e-mail-paned-view.c b/mail/e-mail-paned-view.c
index 134dae5..10c438e 100644
--- a/mail/e-mail-paned-view.c
+++ b/mail/e-mail-paned-view.c
@@ -355,11 +355,6 @@ mail_paned_view_dispose (GObject *object)
 		priv->preview_pane = NULL;
 	}
 
-	if (priv->display != NULL) {
-		g_object_unref (priv->display);
-		priv->display = NULL;
-	}
-
 	if (priv->view_instance != NULL) {
 		g_object_unref (priv->view_instance);
 		priv->view_instance = NULL;