X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;f=shell%2Fev-application.c;h=9fe6596acc64eae059e3c5482b8662940a0f46e7;hb=0526caefb3e35fe432e40fb9503d370907c9ef28;hp=bbd5ec6ee815746ff13b65fb28a98471ff7e42a4;hpb=33f2a253d69c3940a63dbe9d665236bd57bbada5;p=evince.git

diff --git a/shell/ev-application.c b/shell/ev-application.c
index bbd5ec6e..9fe6596a 100644
--- a/shell/ev-application.c
+++ b/shell/ev-application.c
@@ -408,7 +408,17 @@ ev_spawn (const char     *uri,
 	gboolean res;
 	GError  *error = NULL;
 
+#ifdef G_OS_WIN32
+{
+	gchar *dir;
+
+	dir = g_win32_get_package_installation_directory_of_module (NULL);
+	argv[arg++] = g_build_filename (dir, "bin", "evince", NULL);
+	g_free (dir);
+}
+#else
 	argv[arg++] = g_build_filename (BINDIR, "evince", NULL);
+#endif
 
 	/* Page label */
 	if (dest) {
@@ -884,10 +894,6 @@ ev_application_init (EvApplication *ev_application)
                                                     "evince",
                                                     NULL);
 
-        /* FIXME: why make this fatal? */
-        if (!ev_dir_ensure_exists (ev_application->dot_dir, 0700))
-                exit (1);
-
 #ifdef G_OS_WIN32
 {
 	gchar *dir;
@@ -998,8 +1004,12 @@ ev_application_screensaver_disable (EvApplication *application)
 }
 
 const gchar *
-ev_application_get_dot_dir (EvApplication   *application)
+ev_application_get_dot_dir (EvApplication *application,
+                            gboolean create)
 {
+        if (create)
+                g_mkdir_with_parents (application->dot_dir, 0700);
+
 	return application->dot_dir;
 }