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=/branches/gnome-2-20/; revision=2729

diff --git a/ChangeLog b/ChangeLog
index 86a9f1a508cac06c1e436caa27d96dd79d2c822b..5ca8b935d9175fb551177e95f6a66600aa516ce7 100644 (file)
--- 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 3acf2393ecdd9f1c307c1cc4848a3afb4d25631a..49a39cd275f29e9cf4727894bf81f7cf3ed50721 100644 (file)
--- a/shell/ev-window.c
+++ b/shell/ev-window.c
@@ -1453,6 +1453,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);
@@ -3274,8 +3279,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);