From: Carlos Garcia Campos Date: Tue, 9 Jan 2007 18:14:39 +0000 (+0000) Subject: Show main window and load document with the font-config lock held. X-Git-Tag: EVINCE_0_7_1~7 X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=commitdiff_plain;h=2e255763b2cd5b9571039261f9c29465b984bec5;p=evince.git Show main window and load document with the font-config lock held. 2007-01-09 Carlos Garcia Campos * 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 3e92a159..ecd6086d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2007-01-09 Carlos Garcia Campos + + * 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 * configure.ac: diff --git a/shell/ev-application.c b/shell/ev-application.c index f669c140..98bbd3e3 100644 --- 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 21beaeab..7c660756 100644 --- 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; }