Show main window and load document with the font-config lock held.

2007-01-09  Carlos Garcia Campos  <carlosgc@gnome.org>
	* shell/ev-jobs.c: (ev_job_xfer_run):
	* shell/ev-application.c: (ev_application_open_uri_at_dest):
	Show main window and load document with the font-config lock held.

svn path=/trunk/; revision=2203

diff --git a/ChangeLog b/ChangeLog
index 3e92a159e4f93f9e2d3197bcd61a0804a609c8e2..ecd6086dd56adfa2f9a3ce026a9df22215d60efc 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2007-01-09  Carlos Garcia Campos  <carlosgc@gnome.org>
+
+       * shell/ev-jobs.c: (ev_job_xfer_run):
+       * shell/ev-application.c: (ev_application_open_uri_at_dest):
+
+       Show main window and load document with the font-config lock held. 
+
 2007-01-08  Carlos Garcia Campos  <carlosgc@gnome.org>
 
        * configure.ac:

diff --git a/shell/ev-application.c b/shell/ev-application.c
index f669c140965745753cc108e475e8e98ccdfb6040..98bbd3e3e8dc44ec02ffcd6275eee476ba58defd 100644 (file)
--- a/shell/ev-application.c
+++ b/shell/ev-application.c
@@ -366,7 +366,9 @@ ev_application_open_uri_at_dest (EvApplication  *application,
           we can restore window size without flickering */     
        ev_window_open_uri (new_window, uri, dest, mode, unlink_temp_file);
 
+       ev_document_fc_mutex_lock ();
        gtk_widget_show (GTK_WIDGET (new_window));
+       ev_document_fc_mutex_unlock ();
 
        gtk_window_present_with_time (GTK_WINDOW (new_window),
                                      timestamp);

diff --git a/shell/ev-jobs.c b/shell/ev-jobs.c
index 21beaeab0f053e9597f521a78263f6473b9cd852..7c6607563c71228bd7bdb600e1761fdf8e383bc9 100644 (file)
--- a/shell/ev-jobs.c
+++ b/shell/ev-jobs.c
@@ -499,9 +499,11 @@ ev_job_xfer_run (EvJobXfer *job)
           because, e.g., a password is required - if so, just reload rather than
           creating a new instance */
        if (EV_JOB (job)->document) {
+               ev_document_fc_mutex_lock ();
                ev_document_load (EV_JOB (job)->document,
                                  job->local_uri ? job->local_uri : job->uri,
                                  &job->error);
+               ev_document_fc_mutex_unlock ();
                EV_JOB (job)->finished = TRUE;
                return;
        }