Reopen should reload document. Fixes bug 327951.

[evince.git] / shell / ev-application.c

diff --git a/shell/ev-application.c b/shell/ev-application.c
index b7002a750cebff125fe348b7b873e9f56272e6aa..386b86ee5ffd1df6bea82c61f6efe911472ecf56 100644 (file)
--- a/shell/ev-application.c
+++ b/shell/ev-application.c
@@ -247,17 +247,11 @@ ev_application_open_uri_at_dest (EvApplication  *application,
        g_return_if_fail (uri != NULL);
 
        new_window = ev_application_get_uri_window (application, uri);
-       if (new_window != NULL) {
-               gtk_window_present_with_time (GTK_WINDOW (new_window),
-                                             timestamp);
-               if (dest)
-                       ev_window_goto_dest (new_window, dest);
-
-               return;
+       
+       if (new_window == NULL) {
+               new_window = ev_application_get_empty_window (application);
        }
 
-       new_window = ev_application_get_empty_window (application);
-
        if (new_window == NULL) {
                new_window = EV_WINDOW (ev_window_new ());
        }
@@ -330,10 +324,12 @@ ev_application_shutdown (EvApplication *application)
                application->toolbars_file = NULL;
        }
 
+#ifndef HAVE_GTK_RECENT
        if (application->recent_model) {
                g_object_unref (application->recent_model);
                application->recent_model = NULL;
        }
+#endif
        
        g_free (application->last_chooser_uri);
        g_object_unref (application);
@@ -367,7 +363,8 @@ ev_application_init (EvApplication *ev_application)
 
        egg_toolbars_model_set_flags (ev_application->toolbars_model, 0,
                                      EGG_TB_MODEL_NOT_REMOVABLE); 
-                                     
+
+#ifndef HAVE_GTK_RECENT
        ev_application->recent_model = egg_recent_model_new (EGG_RECENT_MODEL_SORT_MRU);
        /* FIXME we should add a mime type filter but current eggrecent
            has only a varargs style api which does not work well when
@@ -375,6 +372,7 @@ ev_application_init (EvApplication *ev_application)
        egg_recent_model_set_limit (ev_application->recent_model, 5);   
        egg_recent_model_set_filter_groups (ev_application->recent_model,
                                            "Evince", NULL);
+#endif /* HAVE_GTK_RECENT */
 }
 
 GList *
@@ -401,10 +399,12 @@ EggToolbarsModel *ev_application_get_toolbars_model (EvApplication *application)
        return application->toolbars_model;
 }
 
+#ifndef HAVE_GTK_RECENT
 EggRecentModel *ev_application_get_recent_model (EvApplication *application)
 {
        return application->recent_model;
 }
+#endif
 
 void ev_application_save_toolbars_model (EvApplication *application)
 {