Fix find on single page documents

2005-04-22  Marco Pesenti Gritti  <mpg@redhat.com>

        * pdf/ev-poppler.cc:
        * shell/ev-view.c: (highlight_find_results):

        Fix find on single page documents

diff --git a/ChangeLog b/ChangeLog
index f28db3ddc100a1b784b99e0c4967d94f4d55ad22..f46e8467b6034352e74c90ca6c9e8e05961e62ab 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2005-04-22  Marco Pesenti Gritti  <mpg@redhat.com>
+
+       * pdf/ev-poppler.cc:
+       * shell/ev-view.c: (highlight_find_results):
+
+       Fix find on single page documents
+
 2005-04-22  Bryan Clark  <clarkbw@cvs.gnome.org>
 
        * data/evince.schemas.in: fix for bug 301390

diff --git a/pdf/ev-poppler.cc b/pdf/ev-poppler.cc
index d20acb04823e5106c12279c45df29846976ddf97..7b55b08cbdbc2ec286351c20349c15741ff6d3fa 100644 (file)
--- a/pdf/ev-poppler.cc
+++ b/pdf/ev-poppler.cc
@@ -659,7 +659,7 @@ 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;
 
@@ -671,9 +671,10 @@ pdf_document_search_idle_callback (void *data)
        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 */
@@ -681,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;
        }
 

diff --git a/shell/ev-view.c b/shell/ev-view.c
index 796aaddbc7b8473a3a7e2406d528ea82f01c2ce1..b9d9ab23aec43fcde9b7ee3405bed951275f3704 100644 (file)
--- a/shell/ev-view.c
+++ b/shell/ev-view.c
@@ -537,11 +537,11 @@ highlight_find_results (EvView *view)
        g_return_if_fail (EV_IS_DOCUMENT_FIND (view->document));
 
        find = EV_DOCUMENT_FIND (view->document);
-#if 0
+
        ev_document_doc_mutex_lock ();
        results = ev_document_find_get_n_results (find, view->current_page);
        ev_document_doc_mutex_unlock ();
-#endif
+
        for (i = 0; i < results; i++) {
                EvRectangle rectangle;
                GdkRectangle view_rectangle;