From: Carlos Garcia Campos <carlosgc@gnome.org>
Date: Sun, 21 Jan 2007 18:10:05 +0000 (+0000)
Subject: Do not acquire fontconfig lock in impress backend, since it is using the
X-Git-Tag: EVINCE_0_7_2~79
X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=commitdiff_plain;h=7bfc69b4adb73bc5f79b708729b08807f1986c11;p=evince.git

Do not acquire fontconfig lock in impress backend, since it is using the

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.

svn path=/trunk/; revision=2242
---

diff --git a/ChangeLog b/ChangeLog
index 00dec961..af42d1b6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+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: 
diff --git a/backend/impress/impress-document.c b/backend/impress/impress-document.c
index 3ea993d1..7459dab1 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 cd6d27ec..47038645 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));