diff options
| author | Jonathan Blandford <jrb@redhat.com> | 2005-04-22 03:39:52 (GMT) |
|---|---|---|
| committer | Jonathan Blandford <jrb@src.gnome.org> | 2005-04-22 03:39:52 (GMT) |
| commit | bf325e9279324f02bcadc0145cd553ed94c23d2d (patch) | |
| tree | 6129bb1466dcf874d07205630db3575761b90874 /pdf/ev-poppler.cc | |
| parent | 4a63e33ac6be1387403071dbd9aed30b4e440242 (diff) | |
actually remove the job.
Thu Apr 21 23:37:52 2005 Jonathan Blandford <jrb@redhat.com>
* shell/ev-pixbuf-cache.c (dispose_cache_job_info): actually
remove the job.
* backend/ev-document.h: Remove EV_DOC_MUTEX in favor of a locking
function. This helps debugging.
Diffstat (limited to 'pdf/ev-poppler.cc')
| -rw-r--r-- | pdf/ev-poppler.cc | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/pdf/ev-poppler.cc b/pdf/ev-poppler.cc index ac70a03..d20acb0 100644 --- a/pdf/ev-poppler.cc +++ b/pdf/ev-poppler.cc @@ -192,7 +192,7 @@ pdf_document_get_page_label (EvDocument *document, poppler_page = poppler_document_get_page (PDF_DOCUMENT (document)->document, page); - g_object_get (poppler_page, + g_object_get (G_OBJECT (poppler_page), "label", &label, NULL); @@ -348,6 +348,8 @@ pdf_document_get_info (EvDocument *document) case POPPLER_PAGE_LAYOUT_TWO_PAGE_RIGHT: info->layout = EV_DOCUMENT_LAYOUT_TWO_PAGE_RIGHT; break; + default: + break; } switch (mode) { @@ -365,6 +367,8 @@ pdf_document_get_info (EvDocument *document) break; case POPPLER_PAGE_MODE_USE_ATTACHMENTS: info->mode = EV_DOCUMENT_MODE_USE_ATTACHMENTS; + default: + break; } info->ui_hints = 0; @@ -662,9 +666,9 @@ pdf_document_search_idle_callback (void *data) page = poppler_document_get_page (search->document->document, search->search_page); - g_mutex_lock (EV_DOC_MUTEX); + ev_document_doc_mutex_lock (); matches = poppler_page_find_text (page, search->text); - g_mutex_unlock (EV_DOC_MUTEX); + ev_document_doc_mutex_unlock (); search->pages[search->search_page] = matches; n_pages = pdf_document_get_n_pages (EV_DOCUMENT (search->document)); @@ -769,7 +773,6 @@ int pdf_document_find_get_n_results (EvDocumentFind *document_find, int page) { PdfDocumentSearch *search = PDF_DOCUMENT (document_find)->search; - int current_page; if (search) { return g_list_length (search->pages[page]); @@ -788,7 +791,6 @@ pdf_document_find_get_result (EvDocumentFind *document_find, PdfDocumentSearch *search = pdf_document->search; PopplerPage *poppler_page; PopplerRectangle *r; - int current_page; double height; if (search == NULL) |