X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;f=shell%2Fev-view.c;h=1a76442a910fb19c53c59407d084f80f6596d372;hb=3937a33dfda49381aae84fe3f37f08f2dd9244c0;hp=fa9fbd8dc65f9ab894e0bef07ee14268ce07bd98;hpb=8fdc90f6d511cd854fdfdf4c5d7066a2bbe00c94;p=evince.git

diff --git a/shell/ev-view.c b/shell/ev-view.c
index fa9fbd8d..1a76442a 100644
--- a/shell/ev-view.c
+++ b/shell/ev-view.c
@@ -1907,7 +1907,8 @@ ev_view_form_field_choice_changed (GtkWidget   *widget,
 		gint item;
 		
 		item = gtk_combo_box_get_active (GTK_COMBO_BOX (widget));
-		if (GPOINTER_TO_INT (field_choice->selected_items->data) != item) {
+		if (!field_choice->selected_items ||
+		    GPOINTER_TO_INT (field_choice->selected_items->data) != item) {
 			g_list_free (field_choice->selected_items);
 			field_choice->selected_items = NULL;
 			field_choice->selected_items = g_list_prepend (field_choice->selected_items,
@@ -2482,7 +2483,7 @@ ev_view_expose_event (GtkWidget      *widget,
 	cairo_t *cr;
 	gint     i;
 
-	if (view->animation) {
+	if (view->animation && ev_transition_animation_ready (view->animation)) {
 		GdkRectangle page_area;
 		GtkBorder    border;
 
@@ -3738,9 +3739,12 @@ draw_one_page (EvView       *view,
 		page_surface = ev_pixbuf_cache_get_surface (view->pixbuf_cache, page);
 
 		if (!page_surface) {
-			draw_loading_text (view,
-					   &real_page_area,
-					   expose_area);
+			if (!view->presentation) {
+				draw_loading_text (view,
+						   &real_page_area,
+						   expose_area);
+			}
+
 			*page_ready = FALSE;
 
 			return;
@@ -4759,17 +4763,10 @@ ev_view_presentation_transition_start (EvView *view)
 	duration = ev_document_transition_get_page_duration (EV_DOCUMENT_TRANSITION (view->document),
 							     view->current_page);
 	if (duration > 0) {
-#if GLIB_CHECK_VERSION (2, 13, 0)
 		view->trans_timeout_id =
 			g_timeout_add_seconds (duration,
 					       (GSourceFunc) transition_next_page,
 					       view);
-#else
-		view->trans_timeout_id =
-			g_timeout_add (duration * 1000,
-				       (GSourceFunc) transition_next_page,
-				       view);
-#endif
 	}
 }
 
@@ -5336,18 +5333,30 @@ ev_view_find_previous (EvView *view)
 	}
 }
 
-void ev_view_search_changed (EvView *view)
+void
+ev_view_search_changed (EvView *view)
 {
 	/* search string has changed, focus on new search result */
 	view->jump_to_find_result = TRUE;
 }
 
-void ev_view_set_highlight_search (EvView *view, gboolean value)
+void
+ev_view_set_highlight_search (EvView *view, gboolean value)
 {
 	view->highlight_find_results = value;
 	gtk_widget_queue_draw (GTK_WIDGET (view));
 }
 
+void
+ev_view_find_cancel (EvView *view)
+{
+	if (EV_IS_DOCUMENT_FIND (view->document)) {
+		EvDocumentFind *find = EV_DOCUMENT_FIND (view->document);
+
+		ev_document_find_cancel (find);
+	}
+}
+
 /*** Selections ***/
 
 /* compute_new_selection_rect/text calculates the area currently selected by