diff options
| author | Carlos Garcia Campos <carlosgc@gnome.org> | 2007-01-09 18:14:39 (GMT) |
|---|---|---|
| committer | Carlos Garcia Campos <carlosgc@src.gnome.org> | 2007-01-09 18:14:39 (GMT) |
| commit | 2e255763b2cd5b9571039261f9c29465b984bec5 (patch) | |
| tree | dcec00af0c6537e1fe3e2b5ad264c99d9801ca73 /shell | |
| parent | 4859616d1323f57c47810c68307e690e36fd0f5d (diff) | |
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
Diffstat (limited to 'shell')
| -rw-r--r-- | shell/ev-application.c | 2 | ||||
| -rw-r--r-- | shell/ev-jobs.c | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/shell/ev-application.c b/shell/ev-application.c index f669c14..98bbd3e 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 21beaea..7c66075 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; } |