|
 |
4b6d7b |
diff -up evolution-3.12.11/composer/e-composer-private.c.crash-composer-gallery evolution-3.12.11/composer/e-composer-private.c
|
|
|
4b6d7b |
--- evolution-3.12.11/composer/e-composer-private.c.crash-composer-gallery 2014-10-29 12:12:27.000000000 +0100
|
|
|
4b6d7b |
+++ evolution-3.12.11/composer/e-composer-private.c 2015-05-22 11:47:18.659085597 +0200
|
|
|
4b6d7b |
@@ -289,7 +289,7 @@ e_composer_private_constructed (EMsgComp
|
|
|
4b6d7b |
GTK_SCROLLED_WINDOW (widget), GTK_SHADOW_IN);
|
|
|
4b6d7b |
gtk_widget_set_size_request (widget, -1, GALLERY_INITIAL_HEIGHT);
|
|
|
4b6d7b |
gtk_paned_pack1 (GTK_PANED (container), widget, FALSE, FALSE);
|
|
|
4b6d7b |
- priv->gallery_scrolled_window = g_object_ref_sink (widget);
|
|
|
4b6d7b |
+ priv->gallery_scrolled_window = g_object_ref_sink (widget); /* despite the ref, do not unref in dispose */
|
|
|
4b6d7b |
gtk_widget_show (widget);
|
|
|
4b6d7b |
|
|
|
4b6d7b |
/* Reparent the scrolled window containing the GtkHTML widget
|
|
|
4b6d7b |
@@ -308,7 +308,7 @@ e_composer_private_constructed (EMsgComp
|
|
|
4b6d7b |
settings, "composer-gallery-path");
|
|
|
4b6d7b |
widget = e_picture_gallery_new (gallery_path);
|
|
|
4b6d7b |
gtk_container_add (GTK_CONTAINER (container), widget);
|
|
|
4b6d7b |
- priv->gallery_icon_view = g_object_ref_sink (widget);
|
|
|
4b6d7b |
+ priv->gallery_icon_view = g_object_ref_sink (widget); /* despite the ref, do not unref in dispose */
|
|
|
4b6d7b |
g_free (gallery_path);
|
|
|
4b6d7b |
|
|
|
4b6d7b |
e_signal_connect_notify (
|
|
|
4b6d7b |
@@ -435,9 +435,6 @@ e_composer_private_dispose (EMsgComposer
|
|
|
4b6d7b |
composer->priv->composer_actions = NULL;
|
|
|
4b6d7b |
}
|
|
|
4b6d7b |
|
|
|
4b6d7b |
- g_clear_object (&composer->priv->gallery_icon_view);
|
|
|
4b6d7b |
- g_clear_object (&composer->priv->gallery_scrolled_window);
|
|
|
4b6d7b |
-
|
|
|
4b6d7b |
g_hash_table_remove_all (composer->priv->inline_images);
|
|
|
4b6d7b |
g_hash_table_remove_all (composer->priv->inline_images_by_url);
|
|
|
4b6d7b |
|