X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;ds=inline;f=shell%2Fev-window.c;h=944a469663bf25a9c4a4255c8f4e2175b997b8d1;hb=8c04c59b0a860e482d1e796f24d6be7e9c2bd76c;hp=cd92a571cacec62c0fc20a89a05f2159470f398a;hpb=539606c89eaccdda111d7cee0fcf29ece5589392;p=evince.git

diff --git a/shell/ev-window.c b/shell/ev-window.c
index cd92a571..944a4696 100644
--- a/shell/ev-window.c
+++ b/shell/ev-window.c
@@ -482,13 +482,13 @@ ev_window_cmd_focus_page_selector (GtkAction *act, EvWindow *window)
 static void
 ev_window_cmd_scroll_forward (GtkAction *action, EvWindow *window)
 {
-	ev_view_scroll (EV_VIEW (window->priv->view), EV_SCROLL_PAGE_FORWARD);
+	ev_view_scroll (EV_VIEW (window->priv->view), EV_SCROLL_PAGE_FORWARD, FALSE);
 }
 
 static void
 ev_window_cmd_scroll_backward (GtkAction *action, EvWindow *window)
 {
-	ev_view_scroll (EV_VIEW (window->priv->view), EV_SCROLL_PAGE_BACKWARD);
+	ev_view_scroll (EV_VIEW (window->priv->view), EV_SCROLL_PAGE_BACKWARD, FALSE);
 }
 
 static void
@@ -1251,7 +1251,10 @@ ev_window_cmd_save_as (GtkAction *action, EvWindow *ev_window)
 
 	ev_document_types_add_filters (fc, ev_window->priv->document);
 	gtk_dialog_set_default_response (GTK_DIALOG (fc), GTK_RESPONSE_OK);
-	
+
+#ifdef HAVE_GTK_FILE_CHOOSER_SET_DO_OVERWRITE_CONFIRMATION
+	gtk_file_chooser_set_do_overwrite_confirmation(GTK_FILE_CHOOSER (fc), TRUE);	
+#endif	
 	file_name = gnome_vfs_format_uri_for_display (ev_window->priv->uri);
 	base_name = g_path_get_basename (file_name);
 	gtk_file_chooser_set_current_name (GTK_FILE_CHOOSER (fc), base_name);
@@ -2618,6 +2621,7 @@ find_bar_search_changed_cb (EggFindBar *find_bar,
 #if 0
 	g_printerr ("search for '%s'\n", search_string ? search_string : "(nil)");
 #endif
+	ev_view_search_changed (EV_VIEW(ev_window->priv->view));
 
 	if (ev_window->priv->document &&
 	    EV_IS_DOCUMENT_FIND (ev_window->priv->document)) {
@@ -2641,6 +2645,12 @@ find_bar_search_changed_cb (EggFindBar *find_bar,
 	}
 }
 
+static void
+find_bar_scroll(EggFindBar *find_bar, GtkScrollType scroll, EvWindow* ev_window)
+{
+	ev_view_scroll(EV_VIEW(ev_window->priv->view), scroll, FALSE);
+}
+
 static void
 zoom_control_changed_cb (EphyZoomAction *action,
 			 float           zoom,
@@ -3518,6 +3528,10 @@ ev_window_init (EvWindow *ev_window)
 			  "notify::visible",
 			  G_CALLBACK (find_bar_search_changed_cb),
 			  ev_window);
+	g_signal_connect (ev_window->priv->find_bar,
+			  "scroll",
+			  G_CALLBACK (find_bar_scroll),
+			  ev_window);
 
 	/* Popups */
 	ev_window->priv->popup = gtk_ui_manager_get_widget (ev_window->priv->ui_manager,