}
static void
-set_document_page (EvView *view, int page)
+set_document_page (EvView *view, int new_page)
{
+ int page;
+ int pages;
+
+ pages = ev_document_get_n_pages (view->document);
+ page = CLAMP (new_page, 1, pages);
+
if (view->document) {
int old_page = ev_document_get_page (view->document);
int old_width, old_height;
view->find_page = page;
view->find_result = 0;
- update_find_status_message (view);
+
+ if (EV_IS_DOCUMENT_FIND (view->document)) {
+ update_find_status_message (view);
+ }
}
}
static void
jump_to_find_result (EvView *view)
{
+ EvDocumentFind *find = EV_DOCUMENT_FIND (view->document);
GdkRectangle rect;
+ int n_results;
+
+ n_results = ev_document_find_get_n_results (find);
- ev_document_find_get_result (EV_DOCUMENT_FIND (view->document),
- view->find_result, &rect);
- ensure_rectangle_is_visible (view, &rect);
+ if (n_results > view->find_result) {
+ ev_document_find_get_result
+ (find, view->find_result, &rect);
+ ensure_rectangle_is_visible (view, &rect);
+ }
}
static void
if (document != view->document) {
if (view->document) {
- g_signal_handlers_disconnect_by_func (view->document,
- find_changed_cb,
- view);
+ g_signal_handlers_disconnect_by_func
+ (view->document, find_changed_cb, view);
g_object_unref (view->document);
}
if (view->document) {
g_object_ref (view->document);
- if (EV_IS_DOCUMENT_FIND (view->document))
+ if (EV_IS_DOCUMENT_FIND (view->document)) {
g_signal_connect (view->document,
"find_changed",
G_CALLBACK (find_changed_cb),
view);
+ }
g_signal_connect (view->document,
"changed",
G_CALLBACK (document_changed_callback),