Add mnemonic for edit toolbar. ctrl+l focus the page entry.

[evince.git] / pdf / ev-poppler.cc

diff --git a/pdf/ev-poppler.cc b/pdf/ev-poppler.cc
index ac70a035d75aeca0f72f3439ed61dbbc9f87fbb6..7b55b08cbdbc2ec286351c20349c15741ff6d3fa 100644 (file)
--- 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;
@@ -655,21 +659,22 @@ pdf_document_search_idle_callback (void *data)
 {
         PdfDocumentSearch *search = (PdfDocumentSearch*) data;
         PdfDocument *pdf_document = search->document;
-        int n_pages, changed_page;
+        int n_pages;
        GList *matches;
        PopplerPage *page;
 
        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));
+       ev_document_find_changed (EV_DOCUMENT_FIND (pdf_document),
+                                 search->search_page);
 
-       changed_page = search->search_page;
+        n_pages = pdf_document_get_n_pages (EV_DOCUMENT (search->document));
         search->search_page += 1;
         if (search->search_page == n_pages) {
                 /* wrap around */
@@ -677,8 +682,6 @@ pdf_document_search_idle_callback (void *data)
         }
 
         if (search->search_page != search->start_page) {
-               ev_document_find_changed (EV_DOCUMENT_FIND (pdf_document),
-                                         changed_page);
                return TRUE;
        }
 
@@ -769,7 +772,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 +790,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)