]> www.fi.muni.cz Git - evince.git/blobdiff - shell/ev-application.c
[windows] Make evince relocatable on windows - GUI
[evince.git] / shell / ev-application.c
index 1d21c2c1dfc6b5d2e4cccb1e2633c8f2f0d43df9..3d4afb1b56dc378e877d709bec024c9c43443249 100644 (file)
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#include "ev-application.h"
-#include "ev-utils.h"
-#include "ev-file-helpers.h"
-#include "ev-document-factory.h"
-#include "totem-scrsaver.h"
+#include <config.h>
+
+#include <stdlib.h>
+#include <string.h>
 
 #include <glib.h>
 #include <glib/gi18n.h>
-#include <glib-object.h>
-#include <gtk/gtkfilechooserdialog.h>
-#include <gtk/gtkstock.h>
-#include <gtk/gtkwidget.h>
-#include <gtk/gtkmain.h>
-
-#if WITH_GNOME
-#include <libgnomeui/gnome-client.h>
+#include <gtk/gtk.h>
+#ifdef GDK_WINDOWING_X11
+#include <gdk/gdkx.h>
 #endif
 
+#include "totem-scrsaver.h"
+#include "eggsmclient.h"
+
+#include "ev-application.h"
+#include "ev-document-factory.h"
+#include "ev-file-helpers.h"
+#include "ev-metadata-manager.h"
+#include "ev-utils.h"
+#include "ev-stock-icons.h"
+
+#ifdef ENABLE_DBUS
+#include "ev-media-player-keys.h"
+#endif /* ENABLE_DBUS */
+
 #ifdef ENABLE_DBUS
-#include "ev-application-service.h"
 #include <dbus/dbus-glib-bindings.h>
+#include "ev-application-service.h"
 #endif
 
-#include <string.h>
+static void ev_application_save_print_settings (EvApplication *application);
 
 struct _EvApplication {
        GObject base_instance;
 
+       gchar *dot_dir;
+       gchar *data_dir;
+       gchar *accel_map_file;
        gchar *toolbars_file;
+       gchar *crashed_file;
+       guint  crashed_idle;
 
        EggToolbarsModel *toolbars_model;
 
-#ifndef HAVE_GTK_RECENT
-       EggRecentModel  *recent_model;
-#endif
-
        TotemScrsaver *scr_saver;
 
-       gchar *last_chooser_uri;
+       EggSMClient *smclient;
+
+       gchar *filechooser_open_uri;
+       gchar *filechooser_save_uri;
+
+#ifdef ENABLE_DBUS
+       EvMediaPlayerKeys *keys;
+#endif /* ENABLE_DBUS */
 
-#ifdef WITH_GTK_PRINT
        GtkPrintSettings *print_settings;
-#if GTK_CHECK_VERSION (2, 11, 0)
-       gchar            *print_settings_file;
-#endif
-#endif
+       GtkPageSetup     *page_setup;
+       GKeyFile         *print_settings_file;
 };
 
 struct _EvApplicationClass {
        GObjectClass base_class;
 };
 
+static EvApplication *instance;
+
 G_DEFINE_TYPE (EvApplication, ev_application, G_TYPE_OBJECT);
 
 #define APPLICATION_SERVICE_NAME "org.gnome.evince.ApplicationService"
 
+#define EV_PRINT_SETTINGS_FILE "print-settings"
+#define EV_PRINT_SETTINGS_GROUP "Print Settings"
+#define EV_PAGE_SETUP_GROUP "Page Setup"
+
 #ifdef ENABLE_DBUS
 gboolean
 ev_application_register_service (EvApplication *application)
@@ -124,7 +143,9 @@ ev_application_register_service (EvApplication *application)
                                              G_OBJECT (application));
        
        application->scr_saver = totem_scrsaver_new (connection);
-       
+
+        ev_metadata_manager_init ();
+
        return TRUE;
 }
 #endif /* ENABLE_DBUS */
@@ -139,8 +160,6 @@ ev_application_register_service (EvApplication *application)
 EvApplication *
 ev_application_get_instance (void)
 {
-       static EvApplication *instance;
-
        if (!instance) {
                instance = EV_APPLICATION (g_object_new (EV_TYPE_APPLICATION, NULL));
        }
@@ -148,55 +167,199 @@ ev_application_get_instance (void)
        return instance;
 }
 
-#if WITH_GNOME
+/* Session */
 static void
-removed_from_session (GnomeClient *client, EvApplication *application)
+save_session (EvApplication *application,
+             GList         *windows_list,
+             GKeyFile      *state_file)
 {
-       ev_application_shutdown (application);
+       GList *l;
+       gint i;
+       const gchar **uri_list;
+       const gchar *empty = "empty-window";
+
+       uri_list = g_new (const gchar *, g_list_length (windows_list));
+       for (l = windows_list, i = 0; l != NULL; l = g_list_next (l), i++) {
+               EvWindow *window = EV_WINDOW (l->data);
+
+               if (ev_window_is_empty (window))
+                       uri_list[i] = empty;
+               else
+                       uri_list[i] = ev_window_get_uri (window);
+       }
+       g_key_file_set_string_list (state_file,
+                                   "Evince",
+                                   "documents",
+                                   (const char **)uri_list,
+                                   i);
+       g_free (uri_list);
 }
 
-static gint
-save_session (GnomeClient *client, gint phase, GnomeSaveStyle save_style, gint shutdown,
-             GnomeInteractStyle interact_style, gint fast, EvApplication *application)
+static void
+ev_application_save_session_crashed (EvApplication *application)
 {
-       GList *windows, *l;
-       char **restart_argv;
-       int argc = 0, k;
+       GList *windows;
 
        windows = ev_application_get_windows (application);
-       restart_argv = g_new (char *, g_list_length (windows) + 1);
-       restart_argv[argc++] = g_strdup ("evince");
+       if (windows) {
+               GKeyFile *crashed_file;
+               gchar    *data;
+               gssize    data_length;
+               GError   *error = NULL;
 
-       for (l = windows; l != NULL; l = l->next) {
-               EvWindow *window = EV_WINDOW (l->data);
-               restart_argv[argc++] = g_strdup (ev_window_get_uri (window));
+               crashed_file = g_key_file_new ();
+               save_session (application, windows, crashed_file);
+
+               data = g_key_file_to_data (crashed_file, (gsize *)&data_length, NULL);
+               g_file_set_contents (application->crashed_file, data, data_length, &error);
+               if (error) {
+                       g_warning ("%s", error->message);
+                       g_error_free (error);
+               }
+               g_free (data);
+               g_key_file_free (crashed_file);
+       } else if (g_file_test (application->crashed_file, G_FILE_TEST_IS_REGULAR)) {
+               GFile *file;
+
+               file = g_file_new_for_path (application->crashed_file);
+               g_file_delete (file, NULL, NULL);
+               g_object_unref (file);
        }
+}
+
+static gboolean
+save_session_crashed_in_idle_cb (EvApplication *application)
+{
+       ev_application_save_session_crashed (application);
+       application->crashed_idle = 0;
+
+       return FALSE;
+}
+
+static void
+save_session_crashed_in_idle (EvApplication *application)
+{
+       if (application->crashed_idle > 0)
+               g_source_remove (application->crashed_idle);
+       application->crashed_idle =
+               g_idle_add ((GSourceFunc)save_session_crashed_in_idle_cb,
+                           application);
+}
 
-       gnome_client_set_restart_command (client, argc, restart_argv);
+static gboolean
+ev_application_run_crash_recovery_dialog (EvApplication *application)
+{
+       GtkWidget *dialog;
+       gint       response;
+
+       dialog = gtk_message_dialog_new (NULL,
+                                        GTK_DIALOG_MODAL,
+                                        GTK_MESSAGE_WARNING,
+                                        GTK_BUTTONS_NONE,
+                                        _("Recover previous documents?"));
+       gtk_message_dialog_format_secondary_text (
+               GTK_MESSAGE_DIALOG (dialog),
+               _("Evince appears to have exited unexpectedly the last time "
+                 "it was run. You can recover the opened documents."));
+
+       gtk_dialog_add_button (GTK_DIALOG (dialog),
+                              _("_Don't Recover"),
+                              GTK_RESPONSE_CANCEL);
+       gtk_dialog_add_button (GTK_DIALOG (dialog),
+                              _("_Recover"),
+                              GTK_RESPONSE_ACCEPT);
+
+       gtk_window_set_title (GTK_WINDOW (dialog), _("Crash Recovery"));
+       gtk_window_set_icon_name (GTK_WINDOW (dialog), "evince");
+       gtk_window_set_position (GTK_WINDOW (dialog), GTK_WIN_POS_CENTER);
+       gtk_window_set_skip_taskbar_hint (GTK_WINDOW (dialog), FALSE);
+       gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_ACCEPT);
+
+       response = gtk_dialog_run (GTK_DIALOG (dialog));
+       gtk_widget_destroy (dialog);
+
+       return response == GTK_RESPONSE_ACCEPT;
+}
 
-       for (k = 0; k < argc; k++) {
-               g_free (restart_argv[k]);
+gboolean
+ev_application_load_session (EvApplication *application)
+{
+       GKeyFile *state_file;
+       gchar   **uri_list;
+
+       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)) {
+                       state_file = g_key_file_new ();
+                       g_key_file_load_from_file (state_file,
+                                                  application->crashed_file,
+                                                  G_KEY_FILE_NONE,
+                                                  NULL);
+               } else {
+                       return FALSE;
+               }
+       } else {
+               return FALSE;
        }
 
-       g_list_free (windows);
-       g_free (restart_argv);
-       
+       uri_list = g_key_file_get_string_list (state_file,
+                                              "Evince",
+                                              "documents",
+                                              NULL, NULL);
+       if (uri_list) {
+               gint i;
+
+               for (i = 0; uri_list[i]; i++) {
+                       if (g_ascii_strcasecmp (uri_list[i], "empty-window") == 0)
+                               ev_application_open_window (application, NULL, GDK_CURRENT_TIME, NULL);
+                       else
+                               ev_application_open_uri (application, uri_list[i], NULL, GDK_CURRENT_TIME, NULL);
+               }
+               g_strfreev (uri_list);
+       }
+       g_key_file_free (state_file);
+
        return TRUE;
 }
 
 static void
-init_session (EvApplication *application)
+smclient_save_state_cb (EggSMClient   *client,
+                       GKeyFile      *state_file,
+                       EvApplication *application)
 {
-       GnomeClient *client;
+       GList *windows;
 
-       client = gnome_master_client ();
+       windows = ev_application_get_windows (application);
+       if (windows) {
+               save_session (application, windows, state_file);
+               g_list_free (windows);
+       }
+}
+
+static void
+smclient_quit_cb (EggSMClient   *client,
+                 EvApplication *application)
+{
+       ev_application_shutdown (application);
+}
 
-       g_signal_connect (client, "save_yourself",
-                         G_CALLBACK (save_session), application);      
-       g_signal_connect (client, "die",
-                         G_CALLBACK (removed_from_session), application);
+static void
+ev_application_init_session (EvApplication *application)
+{
+       application->crashed_file = g_build_filename (application->dot_dir,
+                                                     "evince-crashed", NULL);
+
+       application->smclient = egg_sm_client_get ();
+       g_signal_connect (application->smclient, "save_state",
+                         G_CALLBACK (smclient_save_state_cb),
+                         application);
+       g_signal_connect (application->smclient, "quit",
+                         G_CALLBACK (smclient_quit_cb),
+                         application);
 }
-#endif
 
 /**
  * ev_display_open_if_needed:
@@ -324,30 +487,16 @@ get_destination_from_args (GHashTable *args)
        return dest;
 }
 
-/**
- * get_unlink_temp_file_from_args:
- * @args: a #GHashTable with data passed to the application.
- *
- * It does look if the unlink-temp-file option has been passed from the command
- * line returning it's boolean representation, otherwise it does return %FALSE.
- *
- * Returns: the boolean representation of the unlink-temp-file value or %FALSE
- *          in other case.
- */
-static gboolean
-get_unlink_temp_file_from_args (GHashTable *args)
+static const gchar *
+get_find_string_from_args (GHashTable *args)
 {
-       gboolean unlink_temp_file = FALSE;
-       GValue  *value = NULL;
+       GValue *value = NULL;
 
        g_assert (args != NULL);
 
-       value = g_hash_table_lookup (args, "unlink-temp-file");
-       if (value) {
-               unlink_temp_file = g_value_get_boolean (value);
-       }
+       value = g_hash_table_lookup (args, "find-string");
        
-       return unlink_temp_file;
+       return value ? g_value_get_string (value) : NULL;
 }
 
 /**
@@ -377,13 +526,28 @@ ev_application_open_window (EvApplication  *application,
        }
        
        if (screen) {
+               ev_stock_icons_set_screen (screen);
                gtk_window_set_screen (GTK_WINDOW (new_window), screen);
        }
+
+       ev_application_save_session_crashed (application);
+       g_signal_connect_swapped (new_window, "destroy",
+                                 G_CALLBACK (save_session_crashed_in_idle),
+                                 application);
+
+       if (!GTK_WIDGET_REALIZED (new_window))
+               gtk_widget_realize (new_window);
        
-       gtk_widget_show (new_window);
+#ifdef GDK_WINDOWING_X11
+       if (timestamp <= 0)
+               timestamp = gdk_x11_get_server_time (GTK_WIDGET (new_window)->window);
+       gdk_x11_window_set_user_time (GTK_WIDGET (new_window)->window, timestamp);
        
-       gtk_window_present_with_time (GTK_WINDOW (new_window),
-                                     timestamp);
+       gtk_window_present (GTK_WINDOW (new_window));
+#else
+       gtk_window_present_with_time (GTK_WINDOW (new_window), timestamp);
+#endif /* GDK_WINDOWING_X11 */
+
        return TRUE;
 }
 
@@ -465,7 +629,6 @@ ev_application_get_uri_window (EvApplication *application, const char *uri)
  * @screen: Thee screen where the link will be shown.
  * @dest: The #EvLinkDest of the document.
  * @mode: The run mode of the window.
- * @unlink_temp_file: The unlink_temp_file option value.
  * @timestamp: Current time value.
  */
 void
@@ -474,39 +637,13 @@ ev_application_open_uri_at_dest (EvApplication  *application,
                                 GdkScreen      *screen,
                                 EvLinkDest     *dest,
                                 EvWindowRunMode mode,
-                                gboolean        unlink_temp_file,
+                                const gchar    *search_string,
                                 guint           timestamp)
 {
-       EvWindow     *new_window;
-       GtkIconTheme *icon_theme;
+       EvWindow *new_window;
 
        g_return_if_fail (uri != NULL);
-
-       icon_theme = gtk_icon_theme_get_for_screen (screen);
-       if (icon_theme) {
-               gchar **path = NULL;
-               gint    n_paths;
-               gint    i;
-               gchar  *ev_icons_path;
-
-               /* GtkIconTheme will then look in Evince custom hicolor dir
-                * for icons as well as the standard search paths
-                */
-               ev_icons_path = g_build_filename (DATADIR, "icons", NULL);
-               gtk_icon_theme_get_search_path (icon_theme, &path, &n_paths);
-               for (i = n_paths - 1; i >= 0; i--) {
-                       if (g_ascii_strcasecmp (ev_icons_path, path[i]) == 0)
-                               break;
-               }
-
-               if (i < 0)
-                       gtk_icon_theme_append_search_path (icon_theme,
-                                                          ev_icons_path);
-
-               g_free (ev_icons_path);
-               g_strfreev (path);
-       }       
-
+       
        new_window = ev_application_get_uri_window (application, uri);
        
        if (new_window == NULL) {
@@ -517,19 +654,36 @@ ev_application_open_uri_at_dest (EvApplication  *application,
                new_window = EV_WINDOW (ev_window_new ());
        }
 
-       if (screen)
+       if (screen) {
+               ev_stock_icons_set_screen (screen);
                gtk_window_set_screen (GTK_WINDOW (new_window), screen);
+       }
 
        /* We need to load uri before showing the window, so
           we can restore window size without flickering */     
-       ev_window_open_uri (new_window, uri, dest, mode, unlink_temp_file);
+       ev_window_open_uri (new_window, uri, dest, mode, search_string);
+
+       ev_application_save_session_crashed (application);
+       g_signal_connect_swapped (new_window, "destroy",
+                                 G_CALLBACK (save_session_crashed_in_idle),
+                                 application);
+
+       if (!GTK_WIDGET_REALIZED (GTK_WIDGET (new_window)))
+               gtk_widget_realize (GTK_WIDGET (new_window));
+
+#ifdef GDK_WINDOWING_X11
+       if (timestamp <= 0)
+               timestamp = gdk_x11_get_server_time (GTK_WIDGET (new_window)->window);
+       gdk_x11_window_set_user_time (GTK_WIDGET (new_window)->window, timestamp);
 
        ev_document_fc_mutex_lock ();
-       gtk_widget_show (GTK_WIDGET (new_window));
+       gtk_window_present (GTK_WINDOW (new_window));
        ev_document_fc_mutex_unlock ();
-
-       gtk_window_present_with_time (GTK_WINDOW (new_window),
-                                     timestamp);
+#else
+       ev_document_fc_mutex_lock ();
+       gtk_window_present_with_time (GTK_WINDOW (new_window), timestamp);
+       ev_document_fc_mutex_unlock ();
+#endif /* GDK_WINDOWING_X11 */
 }
 
 /**
@@ -549,19 +703,18 @@ ev_application_open_uri (EvApplication  *application,
 {
        EvLinkDest      *dest = NULL;
        EvWindowRunMode  mode = EV_WINDOW_MODE_NORMAL;
-       gboolean         unlink_temp_file = FALSE;
+       const gchar     *search_string = NULL;
        GdkScreen       *screen = NULL;
 
        if (args) {
                screen = get_screen_from_args (args);
                dest = get_destination_from_args (args);
                mode = get_window_run_mode_from_args (args);
-               unlink_temp_file = (mode == EV_WINDOW_MODE_PREVIEW &&
-                                   get_unlink_temp_file_from_args (args));
+               search_string = get_find_string_from_args (args);
        }
        
        ev_application_open_uri_at_dest (application, uri, screen,
-                                        dest, mode, unlink_temp_file, 
+                                        dest, mode, search_string,
                                         timestamp);
 
        if (dest)
@@ -580,7 +733,7 @@ ev_application_open_uri_list (EvApplication *application,
 
        for (l = uri_list; l != NULL; l = l->next) {
                ev_application_open_uri_at_dest (application, (char *)l->data,
-                                                screen, NULL, 0, FALSE, 
+                                                screen, NULL, 0, NULL,
                                                 timestamp);
        }
 }
@@ -588,6 +741,18 @@ ev_application_open_uri_list (EvApplication *application,
 void
 ev_application_shutdown (EvApplication *application)
 {
+       if (application->crashed_file) {
+               ev_application_save_session_crashed (application);
+               g_free (application->crashed_file);
+               application->crashed_file = NULL;
+       }
+
+       if (application->accel_map_file) {
+               gtk_accel_map_save (application->accel_map_file);
+               g_free (application->accel_map_file);
+               application->accel_map_file = NULL;
+       }
+       
        if (application->toolbars_model) {
                g_object_unref (application->toolbars_model);
                g_free (application->toolbars_file);
@@ -595,44 +760,43 @@ 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
-
-#ifdef WITH_GTK_PRINT
-#if GTK_CHECK_VERSION (2, 11, 0)
+       ev_application_save_print_settings (application);
+       
        if (application->print_settings_file) {
-               if (application->print_settings) {
-                       GError *error = NULL;
-                       
-                       gtk_print_settings_to_file (application->print_settings,
-                                                   application->print_settings_file,
-                                                   &error);
-                       if (error) {
-                               g_warning (error->message);
-                               g_error_free (error);
-                       }
-
-                       g_object_unref (application->print_settings);
-                       application->print_settings = NULL;
-               }
-
-               g_free (application->print_settings_file);
+               g_key_file_free (application->print_settings_file);
                application->print_settings_file = NULL;
        }
-#else /* ! GTK 2.11.0 */
+
        if (application->print_settings) {
                g_object_unref (application->print_settings);
                application->print_settings = NULL;
        }
-#endif /* GTK 2.11.0 */
-#endif /* WITH_GTK_PRINT */
+
+       if (application->page_setup) {
+               g_object_unref (application->page_setup);
+               application->page_setup = NULL;
+       }
+
+#ifdef ENABLE_DBUS
+       if (application->keys) {
+               g_object_unref (application->keys);
+               application->keys = NULL;
+       }
+#endif /* ENABLE_DBUS */
        
-       g_free (application->last_chooser_uri);
+        ev_metadata_manager_shutdown ();
+
+        g_free (application->dot_dir);
+        application->dot_dir = NULL;
+        g_free (application->data_dir);
+        application->data_dir = NULL;
+       g_free (application->filechooser_open_uri);
+        application->filechooser_open_uri = NULL;
+       g_free (application->filechooser_save_uri);
+       application->filechooser_save_uri = NULL;
+
        g_object_unref (application);
+        instance = NULL;
        
        gtk_main_quit ();
 }
@@ -645,36 +809,82 @@ ev_application_class_init (EvApplicationClass *ev_application_class)
 static void
 ev_application_init (EvApplication *ev_application)
 {
-#if WITH_GNOME
-       init_session (ev_application);
+       gint i;
+       const gchar *home_dir;
+       gchar *toolbar_path;
+
+        ev_application->dot_dir = g_build_filename (g_get_home_dir (),
+                                                    ".gnome2",
+                                                    "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;
+
+       dir = g_win32_get_package_installation_directory_of_module (NULL);
+       ev_application->data_dir = g_build_filename (dir, "share", "evince", NULL);
+       g_free (dir);
+}
+#else
+       ev_application->data_dir = g_strdup (DATADIR);
 #endif
 
+       ev_application_init_session (ev_application);
+
+       home_dir = g_get_home_dir ();
+       if (home_dir) {
+               ev_application->accel_map_file = g_build_filename (home_dir,
+                                                                  ".gnome2",
+                                                                  "accels",
+                                                                  "evince",
+                                                                  NULL);
+               gtk_accel_map_load (ev_application->accel_map_file);
+       }
+       
        ev_application->toolbars_model = egg_toolbars_model_new ();
 
        ev_application->toolbars_file = g_build_filename
-                       (ev_dot_dir (), "evince_toolbar.xml", NULL);
+                       (ev_application->dot_dir, "evince_toolbar.xml", NULL);
 
+       toolbar_path = g_build_filename (ev_application->data_dir,
+                                        "evince-toolbar.xml", NULL);
        egg_toolbars_model_load_names (ev_application->toolbars_model,
-                                      DATADIR "/evince-toolbar.xml");
+                                      toolbar_path);
 
        if (!egg_toolbars_model_load_toolbars (ev_application->toolbars_model,
                                               ev_application->toolbars_file)) {
                egg_toolbars_model_load_toolbars (ev_application->toolbars_model,
-                                                 DATADIR"/evince-toolbar.xml");
+                                                 toolbar_path);
+       }
+       g_free (toolbar_path);
+
+       /* Open item doesn't exist anymore,
+        * convert it to OpenRecent for compatibility
+        */
+       for (i = 0; i < egg_toolbars_model_n_items (ev_application->toolbars_model, 0); i++) {
+               const gchar *item;
+               
+               item = egg_toolbars_model_item_nth (ev_application->toolbars_model, 0, i);
+               if (g_ascii_strcasecmp (item, "FileOpen") == 0) {
+                       egg_toolbars_model_remove_item (ev_application->toolbars_model, 0, i);
+                       egg_toolbars_model_add_item (ev_application->toolbars_model, 0, i,
+                                                    "FileOpenRecent");
+                       ev_application_save_toolbars_model (ev_application);
+                       break;
+               }
        }
 
        egg_toolbars_model_set_flags (ev_application->toolbars_model, 0,
-                                     EGG_TB_MODEL_NOT_REMOVABLE); 
+                                     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
-          the list of mime types is dynamic */
-       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 */
+#ifdef ENABLE_DBUS
+       ev_application->keys = ev_media_player_keys_new ();
+#endif /* ENABLE_DBUS */
 }
 
 /**
@@ -704,19 +914,29 @@ ev_application_get_windows (EvApplication *application)
        return windows;
 }
 
-EggToolbarsModel *
-ev_application_get_toolbars_model (EvApplication *application)
+/**
+ * ev_application_get_media_keys:
+ * @application: The instance of the application.
+ *
+ * It gives you access to the media player keys handler object.
+ *
+ * Returns: A #EvMediaPlayerKeys.
+ */
+GObject *
+ev_application_get_media_keys (EvApplication *application)
 {
-       return application->toolbars_model;
+#ifdef ENABLE_DBUS
+       return G_OBJECT (application->keys);
+#else
+       return NULL;
+#endif /* ENABLE_DBUS */
 }
 
-#ifndef HAVE_GTK_RECENT
-EggRecentModel *
-ev_application_get_recent_model (EvApplication *application)
+EggToolbarsModel *
+ev_application_get_toolbars_model (EvApplication *application)
 {
-       return application->recent_model;
+       return application->toolbars_model;
 }
-#endif
 
 void
 ev_application_save_toolbars_model (EvApplication *application)
@@ -726,16 +946,32 @@ ev_application_save_toolbars_model (EvApplication *application)
 }
 
 void
-ev_application_set_chooser_uri (EvApplication *application, const gchar *uri)
+ev_application_set_filechooser_uri (EvApplication       *application,
+                                   GtkFileChooserAction action,
+                                   const gchar         *uri)
 {
-       g_free (application->last_chooser_uri);
-       application->last_chooser_uri = g_strdup (uri);
+       if (action == GTK_FILE_CHOOSER_ACTION_OPEN) {
+               g_free (application->filechooser_open_uri);
+               application->filechooser_open_uri = g_strdup (uri);
+       } else if (action == GTK_FILE_CHOOSER_ACTION_SAVE) {
+               g_free (application->filechooser_save_uri);
+               application->filechooser_save_uri = g_strdup (uri);
+       }
 }
 
 const gchar *
-ev_application_get_chooser_uri (EvApplication *application)
+ev_application_get_filechooser_uri (EvApplication       *application,
+                                   GtkFileChooserAction action)
 {
-       return application->last_chooser_uri;
+       if (action == GTK_FILE_CHOOSER_ACTION_OPEN) {
+               if (application->filechooser_open_uri)
+                       return application->filechooser_open_uri;
+       } else if (action == GTK_FILE_CHOOSER_ACTION_SAVE) {
+               if (application->filechooser_save_uri)
+                       return application->filechooser_save_uri;
+       }
+
+       return NULL;
 }
 
 void
@@ -752,35 +988,83 @@ ev_application_screensaver_disable (EvApplication *application)
                totem_scrsaver_disable (application->scr_saver);        
 }
 
-#ifdef WITH_GTK_PRINT
-GtkPrintSettings *
-ev_application_get_print_settings (EvApplication *application)
+static GKeyFile *
+ev_application_get_print_settings_file (EvApplication *application)
 {
-       if (application->print_settings)
-               return application->print_settings;
+       gchar *filename;
        
-#if GTK_CHECK_VERSION (2, 11, 0)
-       if (!application->print_settings_file) {
-               application->print_settings_file =
-                       g_build_filename (ev_dot_dir (), "print-settings", NULL);
-       }
+       if (application->print_settings_file)
+               return application->print_settings_file;
 
-       if (g_file_test (application->print_settings_file, G_FILE_TEST_IS_REGULAR)) {
+       application->print_settings_file = g_key_file_new ();
+       
+       filename = g_build_filename (ev_application_get_dot_dir (application), EV_PRINT_SETTINGS_FILE, NULL);
+       if (g_file_test (filename, G_FILE_TEST_IS_REGULAR)) {
                GError *error = NULL;
-               
-               application->print_settings =
-                       gtk_print_settings_new_from_file (application->print_settings_file, &error);
-               
+
+               g_key_file_load_from_file (application->print_settings_file,
+                                          filename,
+                                          G_KEY_FILE_KEEP_COMMENTS |
+                                          G_KEY_FILE_KEEP_TRANSLATIONS,
+                                          &error);
                if (error) {
-                       g_warning (error->message);
+                       g_warning ("%s", error->message);
                        g_error_free (error);
-               } else {
-                       return application->print_settings;
                }
        }
-#endif /* GTK 2.11.0 */
+       g_free (filename);
+
+       return application->print_settings_file;
+}
+
+static void
+ev_application_save_print_settings (EvApplication *application)
+{
+       GKeyFile *key_file;
+       gchar    *filename;
+       gchar    *data;
+       gssize    data_length;
+       GError   *error = NULL;
+
+       if (!application->print_settings && !application->page_setup)
+               return;
        
-       application->print_settings = gtk_print_settings_new ();
+       key_file = ev_application_get_print_settings_file (application);
+       if (application->print_settings)
+               gtk_print_settings_to_key_file (application->print_settings,
+                                               key_file,
+                                               EV_PRINT_SETTINGS_GROUP);
+       if (application->page_setup)
+               gtk_page_setup_to_key_file (application->page_setup,
+                                           key_file,
+                                           EV_PAGE_SETUP_GROUP);
+       
+       filename = g_build_filename (ev_application_get_dot_dir (application), EV_PRINT_SETTINGS_FILE, NULL);
+       data = g_key_file_to_data (key_file, (gsize *)&data_length, NULL);
+       g_file_set_contents (filename, data, data_length, &error);
+       if (error) {
+               g_warning ("%s", error->message);
+               g_error_free (error);
+       }
+       g_free (data);
+       g_free (filename);
+}
+
+GtkPrintSettings *
+ev_application_get_print_settings (EvApplication *application)
+{
+       GKeyFile         *key_file;
+       GtkPrintSettings *print_settings;
+       
+       if (application->print_settings)
+               return application->print_settings;
+
+       key_file = ev_application_get_print_settings_file (application);
+       print_settings = g_key_file_has_group (key_file, EV_PRINT_SETTINGS_GROUP) ? 
+               gtk_print_settings_new_from_key_file (key_file, EV_PRINT_SETTINGS_GROUP, NULL) :
+               gtk_print_settings_new ();
+
+       application->print_settings = print_settings ? print_settings : gtk_print_settings_new ();
 
        return application->print_settings;
 }
@@ -789,14 +1073,69 @@ void
 ev_application_set_print_settings (EvApplication    *application,
                                   GtkPrintSettings *settings)
 {
+       GKeyFile *key_file;
+       
        g_return_if_fail (GTK_IS_PRINT_SETTINGS (settings));
        
        if (settings == application->print_settings)
                return;
 
+       key_file = ev_application_get_print_settings_file (application);
+       
        if (application->print_settings)
                g_object_unref (application->print_settings);
        
        application->print_settings = g_object_ref (settings);
+       gtk_print_settings_to_key_file (settings, key_file, EV_PRINT_SETTINGS_GROUP);
+}
+
+GtkPageSetup *
+ev_application_get_page_setup (EvApplication *application)
+{
+       GKeyFile     *key_file;
+       GtkPageSetup *page_setup;
+       
+       if (application->page_setup)
+               return application->page_setup;
+
+       key_file = ev_application_get_print_settings_file (application);
+       page_setup = g_key_file_has_group (key_file, EV_PAGE_SETUP_GROUP) ? 
+               gtk_page_setup_new_from_key_file (key_file, EV_PAGE_SETUP_GROUP, NULL) :
+               gtk_page_setup_new ();
+
+       application->page_setup = page_setup ? page_setup : gtk_page_setup_new ();
+
+       return application->page_setup;
+}
+
+void
+ev_application_set_page_setup (EvApplication *application,
+                              GtkPageSetup  *page_setup)
+{
+       GKeyFile *key_file;
+       
+       g_return_if_fail (GTK_IS_PAGE_SETUP (page_setup));
+       
+       if (page_setup == application->page_setup)
+               return;
+
+       key_file = ev_application_get_print_settings_file (application);
+       
+       if (application->page_setup)
+               g_object_unref (application->page_setup);
+       
+       application->page_setup = g_object_ref (page_setup);
+       gtk_page_setup_to_key_file (page_setup, key_file, EV_PAGE_SETUP_GROUP);
+}
+
+const gchar *
+ev_application_get_dot_dir (EvApplication   *application)
+{
+       return application->dot_dir;
+}
+
+const gchar *
+ev_application_get_data_dir (EvApplication   *application)
+{
+       return application->data_dir;
 }
-#endif /* WITH_GTK_PRINT */