X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;f=shell%2Fev-application.c;h=8802f68af267271bb3324a7605353565ba1cc481;hb=2027dc6231de4f19900a08e07f11e241861d3ef3;hp=eed7be8b7cfd5596af9f9452f0a8150f71effc96;hpb=d8264ef4e6ab48b5d203093bb1c66ae2ae1ad9e0;p=evince.git

diff --git a/shell/ev-application.c b/shell/ev-application.c
index eed7be8b..8802f68a 100644
--- a/shell/ev-application.c
+++ b/shell/ev-application.c
@@ -214,7 +214,7 @@ ev_application_get_uri_window (EvApplication *application, const char *uri)
 			EvWindow *window = EV_WINDOW (l->data);
 			const char *window_uri = ev_window_get_uri (window);
 
-			if (window_uri && strcmp (window_uri, uri) == 0) {
+			if (window_uri && strcmp (window_uri, uri) == 0 && !ev_window_is_empty (window)) {
 				uri_window = window;
 				break;
 			}
@@ -304,7 +304,9 @@ ev_application_shutdown (EvApplication *application)
 		application->recent_model = NULL;
 	}
 
+	g_free (application->last_chooser_uri);
 	g_object_unref (application);
+	
 	gtk_main_quit ();
 }
 
@@ -376,4 +378,14 @@ void ev_application_save_toolbars_model (EvApplication *application)
 				 application->toolbars_file, "1.0");
 }
 
+void ev_application_set_chooser_uri (EvApplication *application, gchar *uri)
+{
+	g_free (application->last_chooser_uri);
+	application->last_chooser_uri = g_strdup (uri);
+}
+
+const gchar* ev_application_get_chooser_uri (EvApplication *application)
+{
+	return application->last_chooser_uri;
+}