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



commit 9d76073f56e9f6936427d24c27f1712d086276c9
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 -----
 mail/em-format-html-display.c |    3 ++-
 3 files changed, 2 insertions(+), 10 deletions(-)
---
diff --git a/mail/e-mail-display.c b/mail/e-mail-display.c
index 3968f22..53c353c 100644
--- a/mail/e-mail-display.c
+++ b/mail/e-mail-display.c
@@ -742,10 +742,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 aaa589c..629f7ee 100644
--- a/mail/e-mail-paned-view.c
+++ b/mail/e-mail-paned-view.c
@@ -350,11 +350,6 @@ mail_paned_view_dispose (GObject *object)
 		priv->search_bar = 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;
diff --git a/mail/em-format-html-display.c b/mail/em-format-html-display.c
index 340de2f..01a7b48 100644
--- a/mail/em-format-html-display.c
+++ b/mail/em-format-html-display.c
@@ -752,10 +752,11 @@ efhd_init (EMFormatHTMLDisplay *efhd)
 	gtk_ui_manager_add_ui_from_string (ui_manager, image_ui, -1, &error);
 	if (error != NULL)
 		g_error ("%s", error->message);
-*/
+
 	g_signal_connect (
 		web_view, "update-actions",
 		G_CALLBACK (efhd_web_view_update_actions_cb), efhd);
+*/
 }
 
 GType



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]