diff options
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | backend/impress/impress-document.c | 5 | ||||
| -rw-r--r-- | shell/ev-view.c | 2 |
3 files changed, 13 insertions, 2 deletions
@@ -1,5 +1,13 @@ 2007-01-21 Carlos Garcia Campos <carlosgc@gnome.org> + * backend/impress/impress-document.c: + (impress_document_render_pixbuf): + + Do not acquire fontconfig lock in impress backend, since it is using + the main loop for rendering. + +2007-01-21 Carlos Garcia Campos <carlosgc@gnome.org> + * po/POTFILES.in: Remove mdvi files that shouldn't be translated. diff --git a/backend/impress/impress-document.c b/backend/impress/impress-document.c index 3ea993d..7459dab 100644 --- a/backend/impress/impress-document.c +++ b/backend/impress/impress-document.c @@ -357,6 +357,7 @@ imp_render_get_from_drawable (ImpressDocument *impress_document) 0, 0, 0, 0, PAGE_WIDTH, PAGE_HEIGHT); + g_cond_broadcast (impress_document->cond); return FALSE; } @@ -376,10 +377,12 @@ impress_document_render_pixbuf (EvDocument *document, g_mutex_lock (impress_document->mutex); impress_document->cond = g_cond_new (); + ev_document_fc_mutex_unlock (); g_idle_add ((GSourceFunc) imp_render_get_from_drawable, impress_document); - g_cond_wait (impress_document->cond, impress_document->mutex); g_cond_free (impress_document->cond); + ev_document_fc_mutex_lock (); + g_mutex_unlock (impress_document->mutex); scaled_pixbuf = gdk_pixbuf_scale_simple (impress_document->pixbuf, diff --git a/shell/ev-view.c b/shell/ev-view.c index cd6d27e..4703864 100644 --- a/shell/ev-view.c +++ b/shell/ev-view.c @@ -1907,7 +1907,7 @@ ev_view_expose_event (GtkWidget *widget, area.width = widget->allocation.width; area.height = widget->allocation.height; - + draw_loading_text (view, &area, &(event->area)); |