Protect gtkhtml writes from threads

[modest] / src / widgets / modest-tny-stream-gtkhtml.c

diff --git a/src/widgets/modest-tny-stream-gtkhtml.c b/src/widgets/modest-tny-stream-gtkhtml.c
index c8ec30c..f17200f 100644 (file)
--- a/src/widgets/modest-tny-stream-gtkhtml.c
+++ b/src/widgets/modest-tny-stream-gtkhtml.c
@@ -204,14 +204,20 @@ gtkhtml_write (TnyStream *self, const char *buffer, size_t n)
 
                /* We only use the maximum size for write method, and even we
                 * ignore and fake as we would do a successfull read */
-               if (priv->current_size > priv->max_size)
+               if (priv->current_size >= priv->max_size)
                        return n;
 
                if (priv->current_size + n > priv->max_size)
                        n = priv->max_size - priv->current_size;
        }
 
+       if (!g_main_context_is_owner (NULL))
+               gdk_threads_enter ();
+
        gtk_html_stream_write (priv->stream, buffer, n);
+
+       if (!g_main_context_is_owner (NULL))
+               gdk_threads_leave ();
        priv->current_size += n;
 
        return n; /* hmmm */
@@ -233,7 +239,14 @@ gtkhtml_close (TnyStream *self)
        priv = MODEST_TNY_STREAM_GTKHTML_GET_PRIVATE(self);
        
        if (priv->html && GTK_WIDGET_VISIBLE (priv->html)) {
+               if (!g_main_context_is_owner (NULL))
+                       gdk_threads_enter ();
+
                gtk_html_stream_close   (priv->stream, GTK_HTML_STREAM_OK);
+
+               if (!g_main_context_is_owner (NULL))
+                       gdk_threads_leave ();
+
        }
        priv->stream = NULL;
        if (priv->html && priv->stop_streams_id > 0) {