Updated Latvian translation.

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

diff --git a/shell/ev-application.c b/shell/ev-application.c
index bbd5ec6ee815746ff13b65fb28a98471ff7e42a4..5a870148fd3c4352fc9e984cc8c5081598987433 100644 (file)
--- a/shell/ev-application.c
+++ b/shell/ev-application.c
@@ -408,7 +408,17 @@ ev_spawn (const char     *uri,
        gboolean res;
        GError  *error = NULL;
 
        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);
        argv[arg++] = g_build_filename (BINDIR, "evince", NULL);

+#endif

 
        /* Page label */
        if (dest) {
 
        /* Page label */
        if (dest) {


@@ -843,6 +853,9 @@ ev_application_shutdown (EvApplication *application)
 
        ev_application_accel_map_save (application);
 
 
        ev_application_accel_map_save (application);
 

+       g_object_unref (application->scr_saver);
+       application->scr_saver = NULL;
+

 #ifdef ENABLE_DBUS
        if (application->keys) {
                g_object_unref (application->keys);
 #ifdef ENABLE_DBUS
        if (application->keys) {
                g_object_unref (application->keys);


@@ -884,10 +897,6 @@ ev_application_init (EvApplication *ev_application)
                                                     "evince",
                                                     NULL);
 
                                                     "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;
 #ifdef G_OS_WIN32
 {
        gchar *dir;


@@ -904,13 +913,14 @@ ev_application_init (EvApplication *ev_application)
 
        ev_application_accel_map_load (ev_application);
 
 
        ev_application_accel_map_load (ev_application);
 

+       ev_application->scr_saver = totem_scrsaver_new ();
+

 #ifdef ENABLE_DBUS
        ev_application->connection = dbus_g_bus_get (DBUS_BUS_STARTER, &error);
        if (ev_application->connection) {
                dbus_g_connection_register_g_object (ev_application->connection,
                                                     APPLICATION_DBUS_OBJECT_PATH,
                                                     G_OBJECT (ev_application));
 #ifdef ENABLE_DBUS
        ev_application->connection = dbus_g_bus_get (DBUS_BUS_STARTER, &error);
        if (ev_application->connection) {
                dbus_g_connection_register_g_object (ev_application->connection,
                                                     APPLICATION_DBUS_OBJECT_PATH,
                                                     G_OBJECT (ev_application));

-               ev_application->scr_saver = totem_scrsaver_new (ev_application->connection);

        } else {
                g_warning ("Error connection to DBus: %s\n", error->message);
                g_error_free (error);
        } else {
                g_warning ("Error connection to DBus: %s\n", error->message);
                g_error_free (error);


@@ -986,20 +996,22 @@ ev_application_get_filechooser_uri (EvApplication       *application,
 void
 ev_application_screensaver_enable (EvApplication *application)
 {
 void
 ev_application_screensaver_enable (EvApplication *application)
 {

-       if (application->scr_saver)
-               totem_scrsaver_enable (application->scr_saver); 
+       totem_scrsaver_enable (application->scr_saver);

 }
 
 void
 ev_application_screensaver_disable (EvApplication *application)
 {
 }
 
 void
 ev_application_screensaver_disable (EvApplication *application)
 {

-       if (application->scr_saver)
-               totem_scrsaver_disable (application->scr_saver);        
+       totem_scrsaver_disable (application->scr_saver);

 }
 
 const gchar *
 }
 
 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;
 }
 
        return application->dot_dir;
 }