Fix misspelling of 'appropriate'

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

diff --git a/shell/ev-application.c b/shell/ev-application.c
index 3d4afb1b56dc378e877d709bec024c9c43443249..8ba99bc1e908f6aad13571a7b0d488d999028ce0 100644 (file)
--- a/shell/ev-application.c
+++ b/shell/ev-application.c
@@ -33,7 +33,10 @@
 #endif
 
 #include "totem-scrsaver.h"
+
+#ifdef WITH_SMCLIENT
 #include "eggsmclient.h"
+#endif
 
 #include "ev-application.h"
 #include "ev-document-factory.h"
@@ -60,14 +63,19 @@ struct _EvApplication {
        gchar *data_dir;
        gchar *accel_map_file;
        gchar *toolbars_file;
+
+#ifdef ENABLE_DBUS
        gchar *crashed_file;
        guint  crashed_idle;
+#endif
 
        EggToolbarsModel *toolbars_model;
 
        TotemScrsaver *scr_saver;
 
+#ifdef WITH_SMCLIENT
        EggSMClient *smclient;
+#endif
 
        gchar *filechooser_open_uri;
        gchar *filechooser_save_uri;
@@ -195,6 +203,7 @@ save_session (EvApplication *application,
        g_free (uri_list);
 }
 
+#ifdef ENABLE_DBUS
 static void
 ev_application_save_session_crashed (EvApplication *application)
 {
@@ -247,11 +256,48 @@ save_session_crashed_in_idle (EvApplication *application)
 }
 
 static gboolean
-ev_application_run_crash_recovery_dialog (EvApplication *application)
+ev_application_run_crash_recovery_dialog (EvApplication *application,
+                                         const gchar  **files)
 {
        GtkWidget *dialog;
        gint       response;
 
+       /* Do not show the recover dialog if the requested file is the
+        * only one to be recovered
+        */
+       if (files && g_strv_length ((gchar **)files) == 1) {
+               GKeyFile *state_file;
+               gchar   **uri_list;
+
+               state_file = g_key_file_new ();
+               g_key_file_load_from_file (state_file,
+                                          application->crashed_file,
+                                          G_KEY_FILE_NONE,
+                                          NULL);
+               uri_list = g_key_file_get_string_list (state_file,
+                                                      "Evince",
+                                                      "documents",
+                                                      NULL, NULL);
+               if (uri_list && g_strv_length (uri_list) == 1) {
+                       GFile *file;
+                       gchar *uri;
+
+                       file = g_file_new_for_commandline_arg (files[0]);
+                       uri = g_file_get_uri (file);
+                       g_object_unref (file);
+                       if (g_ascii_strcasecmp (uri, uri_list[0]) == 0) {
+                               g_strfreev (uri_list);
+                               g_key_file_free (state_file);
+                               g_free (uri);
+
+                               return FALSE;
+                       }
+                       g_free (uri);
+                       g_strfreev (uri_list);
+               }
+               g_key_file_free (state_file);
+       }
+
        dialog = gtk_message_dialog_new (NULL,
                                         GTK_DIALOG_MODAL,
                                         GTK_MESSAGE_WARNING,
@@ -280,19 +326,25 @@ ev_application_run_crash_recovery_dialog (EvApplication *application)
 
        return response == GTK_RESPONSE_ACCEPT;
 }
+#endif /* ENABLE_DBUS */
 
 gboolean
-ev_application_load_session (EvApplication *application)
+ev_application_load_session (EvApplication *application,
+                            const gchar  **files)
 {
        GKeyFile *state_file;
        gchar   **uri_list;
 
+#ifdef WITH_SMCLIENT
        if (egg_sm_client_is_resumed (application->smclient)) {
                state_file = egg_sm_client_get_state_file (application->smclient);
                if (!state_file)
                        return FALSE;
-       } else if (g_file_test (application->crashed_file, G_FILE_TEST_IS_REGULAR)) {
-               if (ev_application_run_crash_recovery_dialog (application)) {
+       } else
+#endif /* WITH_SMCLIENT */
+#ifdef ENABLE_DBUS
+        if (g_file_test (application->crashed_file, G_FILE_TEST_IS_REGULAR)) {
+               if (ev_application_run_crash_recovery_dialog (application, files)) {
                        state_file = g_key_file_new ();
                        g_key_file_load_from_file (state_file,
                                                   application->crashed_file,
@@ -301,9 +353,9 @@ ev_application_load_session (EvApplication *application)
                } else {
                        return FALSE;
                }
-       } else {
+       } else
+#endif /* ENABLE_DBUS */
                return FALSE;
-       }
 
        uri_list = g_key_file_get_string_list (state_file,
                                               "Evince",
@@ -325,6 +377,8 @@ ev_application_load_session (EvApplication *application)
        return TRUE;
 }
 
+#ifdef WITH_SMCLIENT
+
 static void
 smclient_save_state_cb (EggSMClient   *client,
                        GKeyFile      *state_file,
@@ -346,12 +400,17 @@ smclient_quit_cb (EggSMClient   *client,
        ev_application_shutdown (application);
 }
 
+#endif /* WITH_SMCLIENT */
+
 static void
 ev_application_init_session (EvApplication *application)
 {
+#ifdef ENABLE_DBUS
        application->crashed_file = g_build_filename (application->dot_dir,
                                                      "evince-crashed", NULL);
+#endif
 
+#ifdef WITH_SMCLIENT
        application->smclient = egg_sm_client_get ();
        g_signal_connect (application->smclient, "save_state",
                          G_CALLBACK (smclient_save_state_cb),
@@ -359,6 +418,7 @@ ev_application_init_session (EvApplication *application)
        g_signal_connect (application->smclient, "quit",
                          G_CALLBACK (smclient_quit_cb),
                          application);
+#endif
 }
 
 /**
@@ -530,10 +590,12 @@ ev_application_open_window (EvApplication  *application,
                gtk_window_set_screen (GTK_WINDOW (new_window), screen);
        }
 
+#ifdef ENABLE_DBUS
        ev_application_save_session_crashed (application);
        g_signal_connect_swapped (new_window, "destroy",
                                  G_CALLBACK (save_session_crashed_in_idle),
                                  application);
+#endif
 
        if (!GTK_WIDGET_REALIZED (new_window))
                gtk_widget_realize (new_window);
@@ -663,10 +725,12 @@ ev_application_open_uri_at_dest (EvApplication  *application,
           we can restore window size without flickering */     
        ev_window_open_uri (new_window, uri, dest, mode, search_string);
 
+#ifdef ENABLE_DBUS
        ev_application_save_session_crashed (application);
        g_signal_connect_swapped (new_window, "destroy",
                                  G_CALLBACK (save_session_crashed_in_idle),
                                  application);
+#endif
 
        if (!GTK_WIDGET_REALIZED (GTK_WIDGET (new_window)))
                gtk_widget_realize (GTK_WIDGET (new_window));
@@ -741,11 +805,13 @@ ev_application_open_uri_list (EvApplication *application,
 void
 ev_application_shutdown (EvApplication *application)
 {
+#ifdef ENABLE_DBUS
        if (application->crashed_file) {
                ev_application_save_session_crashed (application);
                g_free (application->crashed_file);
                application->crashed_file = NULL;
        }
+#endif
 
        if (application->accel_map_file) {
                gtk_accel_map_save (application->accel_map_file);