From: Carlos Garcia Campos <carlosgc@gnome.org>
Date: Sun, 28 Oct 2007 09:12:20 +0000 (+0000)
Subject: Do not jump to the first page when reloading by running evince from the
X-Git-Tag: EVINCE_2_21_1~27
X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=commitdiff_plain;h=7c85c1e0e3f80dea30341ef219c0de076ef04a92;p=evince.git

Do not jump to the first page when reloading by running evince from the

2007-10-29  Carlos Garcia Campos  <carlosgc@gnome.org>
	* shell/ev-window.c: (ev_window_open_uri),
	(ev_window_cmd_view_reload):
	Do not jump to the first page when reloading by running evince
	from the command line. Fixes bug #490847.

svn path=/trunk/; revision=2728
---

diff --git a/ChangeLog b/ChangeLog
index d18d9ceb..70a034a3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2007-10-29  Carlos Garcia Campos  <carlosgc@gnome.org>
+
+	* shell/ev-window.c: (ev_window_open_uri),
+	(ev_window_cmd_view_reload):
+
+	Do not jump to the first page when reloading by running evince
+	from the command line. Fixes bug #490847.
+	
 2007-10-27  Hiroyuki Ikezoe  <poincare@ikezoe.net>
 
 	* shell/ev-window.c: (ev_window_cmd_help_contents):
diff --git a/shell/ev-window.c b/shell/ev-window.c
index 96200fce..675308d0 100644
--- a/shell/ev-window.c
+++ b/shell/ev-window.c
@@ -1452,6 +1452,11 @@ ev_window_open_uri (EvWindow       *ev_window,
 {
 	GnomeVFSURI *source_uri;
 	GnomeVFSURI *target_uri;
+
+	if (ev_window->priv->uri &&
+	    g_ascii_strcasecmp (ev_window->priv->uri, uri) == 0) {
+		ev_window->priv->in_reload = TRUE;
+	}
 	
 	ev_window_close_dialogs (ev_window);
 	ev_window_clear_load_job (ev_window);
@@ -3224,8 +3229,6 @@ ev_window_cmd_view_reload (GtkAction *action, EvWindow *ev_window)
 {
 	gchar *uri;
 
-	ev_window->priv->in_reload = TRUE;
-	
 	uri = g_strdup (ev_window->priv->uri);
 	ev_window_open_uri (ev_window, uri, NULL, 0, FALSE, NULL);
 	g_free (uri);