]> www.fi.muni.cz Git - evince.git/blobdiff - shell/ev-application.c
Fix indentation
[evince.git] / shell / ev-application.c
index deac0ed5529221e7b16cd665a843c985e84d9acd..600880a1e6ad86dd2d8eff036493fcfcc07505da 100644 (file)
@@ -1,6 +1,7 @@
 /* this file is part of evince, a gnome document viewer
  *
  *  Copyright (C) 2004 Martin Kretzschmar
+ *  Copyright © 2010 Christian Persch
  *
  *  Author:
  *    Martin Kretzschmar <martink@gnome.org>
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, 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 <glib/gstdio.h>
+#include <gtk/gtk.h>
+#ifdef GDK_WINDOWING_X11
+#include <gdk/gdkx.h>
 #endif
+#include <unistd.h>
 
-#ifdef ENABLE_DBUS
-#include "ev-application-service.h"
-#include <dbus/dbus-glib-bindings.h>
+#include "totem-scrsaver.h"
+
+#ifdef WITH_SMCLIENT
+#include "eggsmclient.h"
 #endif
 
-#include <string.h>
+#include "ev-application.h"
+#include "ev-file-helpers.h"
+#include "ev-stock-icons.h"
 
-static void ev_application_add_icon_path_for_screen (GdkScreen *screen);
+#ifdef ENABLE_DBUS
+#include "ev-media-player-keys.h"
+#endif /* ENABLE_DBUS */
 
 struct _EvApplication {
        GObject base_instance;
 
-       gchar *toolbars_file;
+       gchar *uri;
 
-       EggToolbarsModel *toolbars_model;
+       gchar *dot_dir;
+       gchar *data_dir;
 
-       TotemScrsaver *scr_saver;
+#ifdef ENABLE_DBUS
+       GDBusConnection *connection;
+        guint registration_id;
+       EvMediaPlayerKeys *keys;
+       gboolean doc_registered;
+#endif
 
-       gchar *last_chooser_uri;
+       TotemScrsaver *scr_saver;
 
-#ifdef WITH_GTK_PRINT
-       GtkPrintSettings *print_settings;
-#if GTK_CHECK_VERSION (2, 11, 0)
-       gchar            *print_settings_file;
-#endif
+#ifdef WITH_SMCLIENT
+       EggSMClient *smclient;
 #endif
+
+       gchar *filechooser_open_uri;
+       gchar *filechooser_save_uri;
 };
 
 struct _EvApplicationClass {
        GObjectClass base_class;
 };
 
-G_DEFINE_TYPE (EvApplication, ev_application, G_TYPE_OBJECT);
+static EvApplication *instance;
 
-#define APPLICATION_SERVICE_NAME "org.gnome.evince.ApplicationService"
+G_DEFINE_TYPE (EvApplication, ev_application, G_TYPE_OBJECT);
 
 #ifdef ENABLE_DBUS
-gboolean
-ev_application_register_service (EvApplication *application)
-{
-       static DBusGConnection *connection = NULL;
-       DBusGProxy *driver_proxy;
-       GError *err = NULL;
-       guint request_name_result;
-
-       if (connection) {
-               g_warning ("Service already registered.");
-               return FALSE;
-       }
-       
-       connection = dbus_g_bus_get (DBUS_BUS_STARTER, &err);
-       if (connection == NULL) {
-               g_warning ("Service registration failed.");
-               g_error_free (err);
+#define APPLICATION_DBUS_OBJECT_PATH "/org/gnome/evince/Evince"
+#define APPLICATION_DBUS_INTERFACE   "org.gnome.evince.Application"
 
-               return FALSE;
-       }
-
-       driver_proxy = dbus_g_proxy_new_for_name (connection,
-                                                 DBUS_SERVICE_DBUS,
-                                                 DBUS_PATH_DBUS,
-                                                 DBUS_INTERFACE_DBUS);
-
-       if (!org_freedesktop_DBus_request_name (driver_proxy,
-                                               APPLICATION_SERVICE_NAME,
-                                               DBUS_NAME_FLAG_DO_NOT_QUEUE,
-                                               &request_name_result, &err)) {
-               g_warning ("Service registration failed.");
-               g_clear_error (&err);
-       }
-
-       g_object_unref (driver_proxy);
-       
-       if (request_name_result == DBUS_REQUEST_NAME_REPLY_EXISTS) {
-               return FALSE;
-       }
+#define EVINCE_DAEMON_SERVICE        "org.gnome.evince.Daemon"
+#define EVINCE_DAEMON_OBJECT_PATH    "/org/gnome/evince/Daemon"
+#define EVINCE_DAEMON_INTERFACE      "org.gnome.evince.Daemon"
+#endif
 
-       dbus_g_object_type_install_info (EV_TYPE_APPLICATION,
-                                        &dbus_glib_ev_application_object_info);
-       dbus_g_connection_register_g_object (connection,
-                                            "/org/gnome/evince/Evince",
-                                             G_OBJECT (application));
-       
-       application->scr_saver = totem_scrsaver_new (connection);
-       
-       return TRUE;
-}
-#endif /* ENABLE_DBUS */
+static void _ev_application_open_uri_at_dest (EvApplication  *application,
+                                             const gchar    *uri,
+                                             GdkScreen      *screen,
+                                             EvLinkDest     *dest,
+                                             EvWindowRunMode mode,
+                                             const gchar    *search_string,
+                                             guint           timestamp);
+static void ev_application_open_uri_in_window (EvApplication  *application,
+                                              const char     *uri,
+                                              EvWindow       *ev_window,
+                                              GdkScreen      *screen,
+                                              EvLinkDest     *dest,
+                                              EvWindowRunMode mode,
+                                              const gchar    *search_string,
+                                              guint           timestamp);
 
 /**
  * ev_application_get_instance:
@@ -137,8 +117,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));
        }
@@ -146,55 +124,70 @@ ev_application_get_instance (void)
        return instance;
 }
 
-#if WITH_GNOME
-static void
-removed_from_session (GnomeClient *client, EvApplication *application)
-{
-       ev_application_shutdown (application);
-}
-
-static gint
-save_session (GnomeClient *client, gint phase, GnomeSaveStyle save_style, gint shutdown,
-             GnomeInteractStyle interact_style, gint fast, EvApplication *application)
+/* Session */
+gboolean
+ev_application_load_session (EvApplication *application)
 {
-       GList *windows, *l;
-       char **restart_argv;
-       int argc = 0, k;
-
-       windows = ev_application_get_windows (application);
-       restart_argv = g_new (char *, g_list_length (windows) + 1);
-       restart_argv[argc++] = g_strdup ("evince");
-
-       for (l = windows; l != NULL; l = l->next) {
-               EvWindow *window = EV_WINDOW (l->data);
-               restart_argv[argc++] = g_strdup (ev_window_get_uri (window));
-       }
+       GKeyFile *state_file;
+       gchar    *uri;
+
+#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
+#endif /* WITH_SMCLIENT */
+               return FALSE;
 
-       gnome_client_set_restart_command (client, argc, restart_argv);
+       uri = g_key_file_get_string (state_file, "Evince", "uri", NULL);
+       if (!uri)
+               return FALSE;
 
-       for (k = 0; k < argc; k++) {
-               g_free (restart_argv[k]);
-       }
+       ev_application_open_uri_at_dest (application, uri,
+                                        gdk_screen_get_default (),
+                                        NULL, 0, NULL,
+                                        GDK_CURRENT_TIME);
+       g_free (uri);
+       g_key_file_free (state_file);
 
-       g_list_free (windows);
-       g_free (restart_argv);
-       
        return TRUE;
 }
 
+#ifdef WITH_SMCLIENT
+
 static void
-init_session (EvApplication *application)
+smclient_save_state_cb (EggSMClient   *client,
+                       GKeyFile      *state_file,
+                       EvApplication *application)
 {
-       GnomeClient *client;
+       if (!application->uri)
+               return;
 
-       client = gnome_master_client ();
+       g_key_file_set_string (state_file, "Evince", "uri", application->uri);
+}
 
-       g_signal_connect (client, "save_yourself",
-                         G_CALLBACK (save_session), application);      
-       g_signal_connect (client, "die",
-                         G_CALLBACK (removed_from_session), application);
+static void
+smclient_quit_cb (EggSMClient   *client,
+                 EvApplication *application)
+{
+       ev_application_shutdown (application);
 }
+#endif /* WITH_SMCLIENT */
+
+static void
+ev_application_init_session (EvApplication *application)
+{
+#ifdef WITH_SMCLIENT
+       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:
@@ -228,197 +221,127 @@ ev_display_open_if_needed (const gchar *name)
        return display != NULL ? display : gdk_display_open (name);
 }
 
-/**
- * get_screen_from_args:
- * @args: a #GHashTable with data passed to the application.
- *
- * Looks for the screen in the display available in the hash table passed to the
- * application. If the display isn't opened, it's opened and the #GdkScreen
- * assigned to the screen in that display returned.
- *
- * Returns: the #GdkScreen assigned to the screen on the display indicated by
- *          the data on the #GHashTable.
- */
-static GdkScreen *
-get_screen_from_args (GHashTable *args)
+static void
+ev_spawn (const char     *uri,
+         GdkScreen      *screen,
+         EvLinkDest     *dest,
+         EvWindowRunMode mode,
+         const gchar    *search_string,
+         guint           timestamp)
 {
-       GValue     *value = NULL;
-       GdkDisplay *display = NULL;
-       GdkScreen  *screen = NULL;
+       GString *cmd;
+       gchar *path, *cmdline;
+       GAppInfo *app;
+       GdkAppLaunchContext *ctx;
+       GError  *error = NULL;
 
-       g_assert (args != NULL);
-       
-       value = g_hash_table_lookup (args, "display");
-       if (value) {
-               const gchar *display_name;
-               
-               display_name = g_value_get_string (value);
-               display = ev_display_open_if_needed (display_name);
-       }
-       
-       value = g_hash_table_lookup (args, "screen");
-       if (value) {
-               gint screen_number;
-               
-               screen_number = g_value_get_int (value);
-               screen = gdk_display_get_screen (display, screen_number);
-       }
-
-       return screen;
-}
+       cmd = g_string_new (NULL);
 
-/**
- * get_window_run_mode_from_args:
- * @args: a #GHashTable with data passed to the application.
- *
- * It does look if the mode option has been passed from command line, using it
- * as the window run mode, otherwise the run mode will be the normal mode.
- *
- * Returns: The window run mode passed from command line or
- *          EV_WINDOW_MODE_NORMAL in other case.
- */
-static EvWindowRunMode
-get_window_run_mode_from_args (GHashTable *args)
+#ifdef G_OS_WIN32
 {
-       EvWindowRunMode  mode = EV_WINDOW_MODE_NORMAL;
-       GValue          *value = NULL;
+       gchar *dir;
 
-       g_assert (args != NULL);
-
-       value = g_hash_table_lookup (args, "mode");
-       if (value) {
-               mode = g_value_get_uint (value);
-       }
+       dir = g_win32_get_package_installation_directory_of_module (NULL);
+       path = g_build_filename (dir, "bin", "evince", NULL);
 
-       return mode;
+       g_free (dir);
 }
+#else
+       path = g_build_filename (BINDIR, "evince", NULL);
+#endif
 
-/**
- * get_destination_from_args:
- * @args: a #GHashTable with data passed to the application.
- *
- * It does look for the page-label argument parsed from the command line and
- * if it does exist, it returns an #EvLinkDest.
- *
- * Returns: An #EvLinkDest to page-label if it has been passed from the command
- *          line, NULL in other case.
- */
-static EvLinkDest *
-get_destination_from_args (GHashTable *args)
-{
-       EvLinkDest *dest = NULL;
-       GValue     *value = NULL;
+       g_string_append_printf (cmd, " %s", path);
+       g_free (path);
        
-       g_assert (args != NULL);
-       
-       value = g_hash_table_lookup (args, "page-label");
-       if (value) {
+       /* Page label */
+       if (dest) {
                const gchar *page_label;
 
-               page_label = g_value_get_string (value);
-               dest = ev_link_dest_new_page_label (page_label);
+               page_label = ev_link_dest_get_page_label (dest);
+
+               if (page_label)
+                       g_string_append_printf (cmd, " --page-label=%s", page_label);
+               else
+                       g_string_append_printf (cmd, " --page-label=%d",
+                                               ev_link_dest_get_page (dest));
        }
 
-       return dest;
-}
+       /* Find string */
+       if (search_string) {
+               g_string_append_printf (cmd, " --find=%s", search_string);
+       }
 
-/**
- * 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)
-{
-       gboolean unlink_temp_file = FALSE;
-       GValue  *value = NULL;
+       /* Mode */
+       switch (mode) {
+       case EV_WINDOW_MODE_FULLSCREEN:
+               g_string_append (cmd, " -f");
+               break;
+       case EV_WINDOW_MODE_PRESENTATION:
+               g_string_append (cmd, " -s");
+               break;
+       default:
+               break;
+       }
 
-       g_assert (args != NULL);
+       cmdline = g_string_free (cmd, FALSE);
+       app = g_app_info_create_from_commandline (cmdline, NULL, 0, &error);
+
+       if (app != NULL) {
+                GList uri_list;
+
+               ctx = gdk_display_get_app_launch_context (gdk_screen_get_display (screen));
+               gdk_app_launch_context_set_screen (ctx, screen);
+               gdk_app_launch_context_set_timestamp (ctx, timestamp);
+
+                /* Some URIs can be changed when passed through a GFile
+                 * (for instance unsupported uris with strange formats like mailto:),
+                 * so if you have a textual uri you want to pass in as argument,
+                 * consider using g_app_info_launch_uris() instead.
+                 * See https://bugzilla.gnome.org/show_bug.cgi?id=644604
+                 */
+                uri_list.data = (gchar *)uri;
+                uri_list.prev = uri_list.next = NULL;
+               g_app_info_launch_uris (app, &uri_list,
+                                        G_APP_LAUNCH_CONTEXT (ctx), &error);
+
+               g_object_unref (app);
+               g_object_unref (ctx);
+       }
 
-       value = g_hash_table_lookup (args, "unlink-temp-file");
-       if (value) {
-               unlink_temp_file = g_value_get_boolean (value);
+       if (error != NULL) {
+               g_warning ("Error launching evince %s: %s\n", uri, error->message);
+               g_error_free (error);
        }
-       
-       return unlink_temp_file;
+
+       g_free (cmdline);
 }
 
-static const gchar *
-get_print_settings_from_args (GHashTable *args)
+static GList *
+ev_application_get_windows (EvApplication *application)
 {
-       const gchar *print_settings = NULL;
-       GValue      *value = NULL;
+       GList *l, *toplevels;
+       GList *windows = NULL;
 
-       g_assert (args != NULL);
+       toplevels = gtk_window_list_toplevels ();
 
-       value = g_hash_table_lookup (args, "print-settings");
-       if (value) {
-               print_settings = g_value_get_string (value);
+       for (l = toplevels; l != NULL; l = l->next) {
+               if (EV_IS_WINDOW (l->data)) {
+                       windows = g_list_append (windows, l->data);
+               }
        }
 
-       return print_settings;
-}
-
-/**
- * ev_application_open_window:
- * @application: The instance of the application.
- * @args: A #GHashTable with the arguments data.
- * @timestamp: Current time value.
- * @error: The #GError facility.
- * 
- * Creates a new window and if the args are available, it's not NULL, it gets
- * the screen from them and assigns the just created window to it. At last it
- * does show it.
- *
- * Returns: %TRUE.
- */
-gboolean
-ev_application_open_window (EvApplication  *application,
-                           GHashTable     *args,
-                           guint32         timestamp,
-                           GError        **error)
-{
-       GtkWidget *new_window = ev_window_new ();
-       GdkScreen *screen = NULL;
+       g_list_free (toplevels);
 
-       if (args) {
-               screen = get_screen_from_args (args);
-       }
-       
-       if (screen) {
-               gtk_window_set_screen (GTK_WINDOW (new_window), screen);
-       }
-       ev_application_add_icon_path_for_screen (screen);
-       
-       gtk_widget_show (new_window);
-       
-       gtk_window_present_with_time (GTK_WINDOW (new_window),
-                                     timestamp);
-       return TRUE;
+       return windows;
 }
 
-/**
- * ev_application_get_empty_window:
- * @application: The instance of the application.
- * @screen: The screen where the empty window will be search.
- *
- * It does look if there is any empty window in the indicated screen.
- *
- * Returns: The first empty #EvWindow in the passed #GdkScreen or NULL in other
- *          case.
- */
 static EvWindow *
 ev_application_get_empty_window (EvApplication *application,
                                 GdkScreen     *screen)
 {
        EvWindow *empty_window = NULL;
-       GList *windows = ev_application_get_windows (application);
-       GList *l;
+       GList    *windows = ev_application_get_windows (application);
+       GList    *l;
 
        for (l = windows; l != NULL; l = l->next) {
                EvWindow *window = EV_WINDOW (l->data);
@@ -431,77 +354,322 @@ ev_application_get_empty_window (EvApplication *application,
        }
 
        g_list_free (windows);
-       
+
        return empty_window;
 }
 
-/**
- * ev_application_get_uri_window:
- * @application: The instance of the application.
- * @uri: The uri to be opened.
+
+#ifdef ENABLE_DBUS
+typedef struct {
+       gchar          *uri;
+       GdkScreen      *screen;
+       EvLinkDest     *dest;
+       EvWindowRunMode mode;
+       gchar          *search_string;
+       guint           timestamp;
+} EvRegisterDocData;
+
+static void
+ev_register_doc_data_free (EvRegisterDocData *data)
+{
+       if (!data)
+               return;
+
+       g_free (data->uri);
+       if (data->search_string)
+               g_free (data->search_string);
+       if (data->dest)
+               g_object_unref (data->dest);
+
+       g_free (data);
+}
+
+static void
+on_reload_cb (GObject      *source_object,
+             GAsyncResult *res,
+             gpointer      user_data)
+{
+       GDBusConnection *connection = G_DBUS_CONNECTION (source_object);
+       GVariant        *value;
+       GError          *error = NULL;
+
+       value = g_dbus_connection_call_finish (connection, res, &error);
+       if (!value) {
+               g_warning ("Failed to Reload: %s", error->message);
+               g_error_free (error);
+       }
+       g_variant_unref (value);
+
+       /* We did not open a window, so manually clear the startup
+        * notification. */
+       gdk_notify_startup_complete ();
+
+       ev_application_shutdown (EV_APP);
+}
+
+static void
+on_register_uri_cb (GObject      *source_object,
+                   GAsyncResult *res,
+                   gpointer      user_data)
+{
+       GDBusConnection   *connection = G_DBUS_CONNECTION (source_object);
+       EvRegisterDocData *data = (EvRegisterDocData *)user_data;
+       EvApplication     *application = EV_APP;
+       GVariant          *value;
+       const gchar       *owner;
+       GVariantBuilder    builder;
+       GError            *error = NULL;
+
+       value = g_dbus_connection_call_finish (connection, res, &error);
+       if (!value) {
+               g_warning ("Error registering document: %s\n", error->message);
+               g_error_free (error);
+
+               _ev_application_open_uri_at_dest (application,
+                                                 data->uri,
+                                                 data->screen,
+                                                 data->dest,
+                                                 data->mode,
+                                                 data->search_string,
+                                                 data->timestamp);
+               ev_register_doc_data_free (data);
+
+               return;
+       }
+
+       g_variant_get (value, "(&s)", &owner);
+
+       /* This means that the document wasn't already registered; go
+         * ahead with opening it.
+         */
+       if (owner[0] == '\0') {
+                g_variant_unref (value);
+
+               application->doc_registered = TRUE;
+
+               _ev_application_open_uri_at_dest (application,
+                                                 data->uri,
+                                                 data->screen,
+                                                 data->dest,
+                                                 data->mode,
+                                                 data->search_string,
+                                                 data->timestamp);
+               ev_register_doc_data_free (data);
+
+                return;
+        }
+
+       /* Already registered */
+       g_variant_builder_init (&builder, G_VARIANT_TYPE ("(a{sv}u)"));
+        g_variant_builder_open (&builder, G_VARIANT_TYPE ("a{sv}"));
+        g_variant_builder_add (&builder, "{sv}",
+                               "display",
+                               g_variant_new_string (gdk_display_get_name (gdk_screen_get_display (data->screen))));
+        g_variant_builder_add (&builder, "{sv}",
+                               "screen",
+                               g_variant_new_int32 (gdk_screen_get_number (data->screen)));
+       if (data->dest) {
+                const gchar *page_label = ev_link_dest_get_page_label (data->dest);
+
+                if (page_label) {
+                        g_variant_builder_add (&builder, "{sv}",
+                                               "page-label",
+                                               g_variant_new_string (page_label));
+                } else {
+                        g_variant_builder_add (&builder, "{sv}",
+                                               "page-index",
+                                               g_variant_new_uint32 (ev_link_dest_get_page (data->dest)));
+                }
+       }
+       if (data->search_string) {
+                g_variant_builder_add (&builder, "{sv}",
+                                       "find-string",
+                                       g_variant_new_string (data->search_string));
+       }
+       if (data->mode != EV_WINDOW_MODE_NORMAL) {
+                g_variant_builder_add (&builder, "{sv}",
+                                       "mode",
+                                       g_variant_new_uint32 (data->mode));
+       }
+        g_variant_builder_close (&builder);
+
+        g_variant_builder_add (&builder, "u", data->timestamp);
+
+        g_dbus_connection_call (connection,
+                               owner,
+                               APPLICATION_DBUS_OBJECT_PATH,
+                               APPLICATION_DBUS_INTERFACE,
+                               "Reload",
+                               g_variant_builder_end (&builder),
+                               NULL,
+                               G_DBUS_CALL_FLAGS_NONE,
+                               -1,
+                               NULL,
+                               on_reload_cb,
+                               NULL);
+       g_variant_unref (value);
+       ev_register_doc_data_free (data);
+}
+
+/*
+ * ev_application_register_uri:
+ * @application:
+ * @uri:
+ * @screen:
+ * @dest:
+ * @mode:
+ * @search_string:
+ * @timestamp:
  *
- * It looks in the list of the windows for the one with the document represented
- * by the passed uri on it. If the window is empty or the document isn't present
- * on any window, it will return NULL.
+ * Registers @uri with evince-daemon.
  *
- * Returns: The #EvWindow where the document represented by the passed uri is
- *          shown, NULL in other case.
  */
-static EvWindow *
-ev_application_get_uri_window (EvApplication *application, const char *uri)
+static void
+ev_application_register_uri (EvApplication  *application,
+                            const gchar    *uri,
+                             GdkScreen      *screen,
+                             EvLinkDest     *dest,
+                             EvWindowRunMode mode,
+                             const gchar    *search_string,
+                            guint           timestamp)
 {
-       EvWindow *uri_window = NULL;
-       GList *windows = gtk_window_list_toplevels ();
-       GList *l;
+       EvRegisterDocData *data;
 
-       g_return_val_if_fail (uri != NULL, NULL);
+       if (!application->connection)
+               return;
 
-       for (l = windows; l != NULL; l = l->next) {
-               if (EV_IS_WINDOW (l->data)) {
-                       EvWindow *window = EV_WINDOW (l->data);
-                       const char *window_uri = ev_window_get_uri (window);
+       if (application->doc_registered) {
+               /* Already registered, reload */
+               GList *windows, *l;
 
-                       if (window_uri && strcmp (window_uri, uri) == 0 && !ev_window_is_empty (window)) {
-                               uri_window = window;
-                               break;
-                       }
+               windows = ev_application_get_windows (application);
+               for (l = windows; l != NULL; l = g_list_next (l)) {
+                       EvWindow *ev_window = EV_WINDOW (l->data);
+
+                       ev_application_open_uri_in_window (application, uri, ev_window,
+                                                          screen, dest, mode,
+                                                          search_string,
+                                                          timestamp);
                }
+               g_list_free (windows);
+
+               return;
        }
 
-       g_list_free (windows);
-       
-       return uri_window;
+       data = g_new (EvRegisterDocData, 1);
+       data->uri = g_strdup (uri);
+       data->screen = screen;
+       data->dest = dest ? g_object_ref (dest) : NULL;
+       data->mode = mode;
+       data->search_string = search_string ? g_strdup (search_string) : NULL;
+       data->timestamp = timestamp;
+
+        g_dbus_connection_call (application->connection,
+                               EVINCE_DAEMON_SERVICE,
+                               EVINCE_DAEMON_OBJECT_PATH,
+                               EVINCE_DAEMON_INTERFACE,
+                               "RegisterDocument",
+                               g_variant_new ("(s)", uri),
+                               G_VARIANT_TYPE ("(s)"),
+                               G_DBUS_CALL_FLAGS_NONE,
+                               -1,
+                               NULL,
+                               on_register_uri_cb,
+                               data);
 }
 
 static void
-ev_application_add_icon_path_for_screen (GdkScreen *screen)
-{
-       GtkIconTheme *icon_theme;
-
-       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;
-               }
+ev_application_unregister_uri (EvApplication *application,
+                              const gchar   *uri)
+{
+        GVariant *value;
+       GError   *error = NULL;
+
+       if (!application->doc_registered)
+               return;
+
+       /* This is called from ev_application_shutdown(),
+        * so it's safe to use the sync api
+        */
+        value = g_dbus_connection_call_sync (
+               application->connection,
+               EVINCE_DAEMON_SERVICE,
+               EVINCE_DAEMON_OBJECT_PATH,
+               EVINCE_DAEMON_INTERFACE,
+               "UnregisterDocument",
+               g_variant_new ("(s)", uri),
+               NULL,
+               G_DBUS_CALL_FLAGS_NO_AUTO_START,
+               -1,
+               NULL,
+               &error);
+        if (value == NULL) {
+               g_warning ("Error unregistering document: %s\n", error->message);
+               g_error_free (error);
+       } else {
+                g_variant_unref (value);
+       }
+}
+#endif /* ENABLE_DBUS */
+
+static void
+ev_application_open_uri_in_window (EvApplication  *application,
+                                  const char     *uri,
+                                  EvWindow       *ev_window,
+                                  GdkScreen      *screen,
+                                  EvLinkDest     *dest,
+                                  EvWindowRunMode mode,
+                                  const gchar    *search_string,
+                                  guint           timestamp)
+{
+#ifdef GDK_WINDOWING_X11
+       GdkWindow *gdk_window;
+#endif
+
+       if (screen) {
+               ev_stock_icons_set_screen (screen);
+               gtk_window_set_screen (GTK_WINDOW (ev_window), screen);
+       }
+
+       /* We need to load uri before showing the window, so
+          we can restore window size without flickering */
+       ev_window_open_uri (ev_window, uri, dest, mode, search_string);
+
+       if (!gtk_widget_get_realized (GTK_WIDGET (ev_window)))
+               gtk_widget_realize (GTK_WIDGET (ev_window));
+
+#ifdef GDK_WINDOWING_X11
+       gdk_window = gtk_widget_get_window (GTK_WIDGET (ev_window));
+
+       if (timestamp <= 0)
+               timestamp = gdk_x11_get_server_time (gdk_window);
+       gdk_x11_window_set_user_time (gdk_window, timestamp);
+
+       gtk_window_present (GTK_WINDOW (ev_window));
+#else
+       gtk_window_present_with_time (GTK_WINDOW (ev_window), timestamp);
+#endif /* GDK_WINDOWING_X11 */
+}
 
-               if (i < 0)
-                       gtk_icon_theme_append_search_path (icon_theme,
-                                                          ev_icons_path);
+static void
+_ev_application_open_uri_at_dest (EvApplication  *application,
+                                 const gchar    *uri,
+                                 GdkScreen      *screen,
+                                 EvLinkDest     *dest,
+                                 EvWindowRunMode mode,
+                                 const gchar    *search_string,
+                                 guint           timestamp)
+{
+       EvWindow *ev_window;
+
+       ev_window = ev_application_get_empty_window (application, screen);
+       if (!ev_window)
+               ev_window = EV_WINDOW (ev_window_new ());
 
-               g_free (ev_icons_path);
-               g_strfreev (path);
-       }       
+       ev_application_open_uri_in_window (application, uri, ev_window,
+                                          screen, dest, mode,
+                                          search_string,
+                                          timestamp);
 }
 
 /**
@@ -511,7 +679,6 @@ ev_application_add_icon_path_for_screen (GdkScreen *screen)
  * @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
@@ -520,82 +687,177 @@ ev_application_open_uri_at_dest (EvApplication  *application,
                                 GdkScreen      *screen,
                                 EvLinkDest     *dest,
                                 EvWindowRunMode mode,
-                                gboolean        unlink_temp_file,
-                                const gchar    *print_settings, 
+                                const gchar    *search_string,
                                 guint           timestamp)
 {
-       EvWindow *new_window;
-
        g_return_if_fail (uri != NULL);
-       
-       ev_application_add_icon_path_for_screen (screen);
 
-       new_window = ev_application_get_uri_window (application, uri);
-       
-       if (new_window == NULL) {
-               new_window = ev_application_get_empty_window (application, screen);
+       if (application->uri && strcmp (application->uri, uri) != 0) {
+               /* spawn a new evince process */
+               ev_spawn (uri, screen, dest, mode, search_string, timestamp);
+               return;
+       } else if (!application->uri) {
+               application->uri = g_strdup (uri);
        }
 
-       if (new_window == NULL) {
-               new_window = EV_WINDOW (ev_window_new ());
-       }
+#ifdef ENABLE_DBUS
+       /* Register the uri or send Reload to
+        * remote instance if already registered
+        */
+       ev_application_register_uri (application, uri, screen, dest, mode, search_string, timestamp);
+#else
+       _ev_application_open_uri_at_dest (application, uri, screen, dest, mode, search_string, timestamp);
+#endif /* ENABLE_DBUS */
+}
+
+/**
+ * ev_application_open_window:
+ * @application: The instance of the application.
+ * @timestamp: Current time value.
+ *
+ * Creates a new window
+ */
+void
+ev_application_open_window (EvApplication *application,
+                           GdkScreen     *screen,
+                           guint32        timestamp)
+{
+       GtkWidget *new_window = ev_window_new ();
+#ifdef GDK_WINDOWING_X11
+       GdkWindow *gdk_window;
+#endif
 
-       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, print_settings);
+       if (!gtk_widget_get_realized (new_window))
+               gtk_widget_realize (new_window);
+
+#ifdef GDK_WINDOWING_X11
+       gdk_window = gtk_widget_get_window (GTK_WIDGET (new_window));
 
-       ev_document_fc_mutex_lock ();
-       gtk_widget_show (GTK_WIDGET (new_window));
-       ev_document_fc_mutex_unlock ();
+       if (timestamp <= 0)
+               timestamp = gdk_x11_get_server_time (gdk_window);
+       gdk_x11_window_set_user_time (gdk_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 */
 }
 
-/**
- * ev_application_open_uri:
- * @application: The instance of the application.
- * @uri: The uri to be opened
- * @args: A #GHashTable with the arguments data.
- * @timestamp: Current time value.
- * @error: The #GError facility.
- */
-gboolean
-ev_application_open_uri (EvApplication  *application,
-                        const char     *uri,
-                        GHashTable     *args,
-                        guint           timestamp,
-                        GError        **error)
+#ifdef ENABLE_DBUS
+static void
+method_call_cb (GDBusConnection       *connection,
+                const gchar           *sender,
+                const gchar           *object_path,
+                const gchar           *interface_name,
+                const gchar           *method_name,
+                GVariant              *parameters,
+                GDBusMethodInvocation *invocation,
+                gpointer               user_data)
 {
+        EvApplication   *application = EV_APPLICATION (user_data);
+       GList           *windows, *l;
+        guint            timestamp;
+        GVariantIter    *iter;
+        const gchar     *key;
+        GVariant        *value;
+        GdkDisplay      *display = NULL;
+        int              screen_number = 0;
        EvLinkDest      *dest = NULL;
        EvWindowRunMode  mode = EV_WINDOW_MODE_NORMAL;
-       gboolean         unlink_temp_file = FALSE;
-       const gchar     *print_settings = NULL;
+       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));
-               print_settings = get_print_settings_from_args (args);
-       }
-       
-       ev_application_open_uri_at_dest (application, uri, screen,
-                                        dest, mode, unlink_temp_file,
-                                        print_settings, timestamp);
+       if (g_strcmp0 (method_name, "Reload") == 0) {
+               g_variant_get (parameters, "(a{sv}u)", &iter, &timestamp);
+
+               while (g_variant_iter_loop (iter, "{&sv}", &key, &value)) {
+                       if (strcmp (key, "display") == 0 && g_variant_classify (value) == G_VARIANT_CLASS_STRING) {
+                               display = ev_display_open_if_needed (g_variant_get_string (value, NULL));
+                       } else if (strcmp (key, "screen") == 0 && g_variant_classify (value) == G_VARIANT_CLASS_INT32) {
+                               screen_number = g_variant_get_int32 (value);
+                       } else if (strcmp (key, "mode") == 0 && g_variant_classify (value) == G_VARIANT_CLASS_UINT32) {
+                                mode = g_variant_get_uint32 (value);
+                       } else if (strcmp (key, "page-label") == 0 && g_variant_classify (value) == G_VARIANT_CLASS_STRING) {
+                               dest = ev_link_dest_new_page_label (g_variant_get_string (value, NULL));
+                        } else if (strcmp (key, "page-index") == 0 && g_variant_classify (value) == G_VARIANT_CLASS_UINT32) {
+                                dest = ev_link_dest_new_page (g_variant_get_uint32 (value));
+                       } else if (strcmp (key, "find-string") == 0 && g_variant_classify (value) == G_VARIANT_CLASS_STRING) {
+                               search_string = g_variant_get_string (value, NULL);
+                       }
+               }
+               g_variant_iter_free (iter);
+
+               if (display != NULL &&
+                   screen_number >= 0 &&
+                   screen_number < gdk_display_get_n_screens (display))
+                       screen = gdk_display_get_screen (display, screen_number);
+               else
+                       screen = gdk_screen_get_default ();
+
+               windows = ev_application_get_windows (application);
+               for (l = windows; l != NULL; l = g_list_next (l)) {
+                       EvWindow *ev_window = EV_WINDOW (l->data);
+
+                       ev_application_open_uri_in_window (application, application->uri,
+                                                          ev_window,
+                                                          screen, dest, mode,
+                                                          search_string,
+                                                          timestamp);
+               }
+               g_list_free (windows);
 
-       if (dest)
-               g_object_unref (dest);
+               if (dest)
+                       g_object_unref (dest);
 
-       return TRUE;
+               g_dbus_method_invocation_return_value (invocation, g_variant_new ("()"));
+       } else if (g_strcmp0 (method_name, "GetWindowList") == 0) {
+               GList          *windows = ev_application_get_windows (application);
+               GVariantBuilder builder;
+               GList          *l;
+
+               g_variant_builder_init (&builder, G_VARIANT_TYPE ("(ao)"));
+               g_variant_builder_open (&builder, G_VARIANT_TYPE ("ao"));
+
+               for (l = windows; l; l = g_list_next (l)) {
+                       EvWindow *window = (EvWindow *)l->data;
+
+                       g_variant_builder_add (&builder, "o", ev_window_get_dbus_object_path (window));
+               }
+
+               g_variant_builder_close (&builder);
+               g_list_free (windows);
+
+               g_dbus_method_invocation_return_value (invocation, g_variant_builder_end (&builder));
+       }
 }
 
+static const char introspection_xml[] =
+        "<node>"
+          "<interface name='org.gnome.evince.Application'>"
+            "<method name='Reload'>"
+              "<arg type='a{sv}' name='args' direction='in'/>"
+              "<arg type='u' name='timestamp' direction='in'/>"
+            "</method>"
+            "<method name='GetWindowList'>"
+              "<arg type='ao' name='window_list' direction='out'/>"
+            "</method>"
+          "</interface>"
+        "</node>";
+
+static const GDBusInterfaceVTable interface_vtable = {
+       method_call_cb,
+       NULL,
+       NULL
+};
+
+static GDBusNodeInfo *introspection_data;
+#endif /* ENABLE_DBUS */
+
 void
 ev_application_open_uri_list (EvApplication *application,
                              GSList        *uri_list,
@@ -606,52 +868,195 @@ 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,
-                                                NULL, timestamp);
+                                                screen, NULL, 0, NULL,
+                                                timestamp);
        }
 }
 
+static void
+ev_application_accel_map_save (EvApplication *application)
+{
+       gchar *accel_map_file;
+       gchar *tmp_filename;
+       gint   fd;
+
+        accel_map_file = g_build_filename (application->dot_dir, "accels", NULL);
+       tmp_filename = g_strdup_printf ("%s.XXXXXX", accel_map_file);
+
+       fd = g_mkstemp (tmp_filename);
+       if (fd == -1) {
+               g_free (accel_map_file);
+               g_free (tmp_filename);
+
+               return;
+       }
+       gtk_accel_map_save_fd (fd);
+       close (fd);
+
+        g_mkdir_with_parents (application->dot_dir, 0700);
+       if (g_rename (tmp_filename, accel_map_file) == -1) {
+               /* FIXME: win32? */
+               g_unlink (tmp_filename);
+       }
+
+       g_free (accel_map_file);
+       g_free (tmp_filename);
+}
+
+static void
+ev_application_accel_map_load (EvApplication *application)
+{
+       gchar *accel_map_file;
+
+        accel_map_file = g_build_filename (application->dot_dir, "accels", NULL);
+       gtk_accel_map_load (accel_map_file);
+       g_free (accel_map_file);
+}
+
+static void
+ev_application_migrate_config_dir (EvApplication *application)
+{
+        const gchar        *userdir;
+        gchar              *old_dot_dir;
+        gchar              *old_accels;
+        GError             *error;
+        gint                i;
+        gboolean            dir_created = FALSE;
+        static const gchar *config_files[] = {
+                "evince_toolbar.xml",
+                "print-settings",
+                NULL
+        };
+
+        userdir = g_getenv ("GNOME22_USER_DIR");
+        if (userdir) {
+                old_dot_dir = g_build_filename (userdir, "evince", NULL);
+                old_accels = g_build_filename (userdir, "accels", "evince", NULL);
+        } else {
+                old_dot_dir = g_build_filename (g_get_home_dir (),
+                                                ".gnome2",
+                                                "evince",
+                                                NULL);
+                old_accels = g_build_filename (g_get_home_dir (),
+                                               ".gnome2", "accels",
+                                               "evince", NULL);
+        }
+
+        if (g_file_test (old_dot_dir, G_FILE_TEST_EXISTS | G_FILE_TEST_IS_DIR)) {
+                for (i = 0; config_files[i]; i++) {
+                        gchar   *old_filename;
+                        gchar   *new_filename;
+                        GFile   *old_file;
+                        GFile   *new_file;
+
+                        old_filename = g_build_filename (old_dot_dir, config_files[i], NULL);
+                        if (!g_file_test (old_filename, G_FILE_TEST_EXISTS)) {
+                                g_free (old_filename);
+                                continue;
+                        }
+
+                        if (!dir_created) {
+                                g_mkdir_with_parents (application->dot_dir, 0700);
+                                dir_created = TRUE;
+                        }
+
+                        new_filename = g_build_filename (application->dot_dir, config_files[i], NULL);
+                        old_file = g_file_new_for_path (old_filename);
+                        new_file = g_file_new_for_path (new_filename);
+
+                        error = NULL;
+                        g_file_move (old_file, new_file, 0, NULL, NULL, NULL, &error);
+                        if (error) {
+                                g_warning ("Error migrating config file %s: %s\n",
+                                           old_filename, error->message);
+                                g_error_free (error);
+                        }
+
+                        g_free (old_filename);
+                        g_free (new_filename);
+                        g_object_unref (old_file);
+                        g_object_unref (new_file);
+                }
+        }
+
+        g_free (old_dot_dir);
+
+        if (g_file_test (old_accels, G_FILE_TEST_EXISTS)) {
+                gchar *new_accels;
+                GFile *old_accels_file;
+                GFile *new_accels_file;
+
+                if (!dir_created)
+                        g_mkdir_with_parents (application->dot_dir, 0700);
+
+                new_accels = g_build_filename (application->dot_dir, "accels", NULL);
+                old_accels_file = g_file_new_for_path (old_accels);
+                new_accels_file = g_file_new_for_path (new_accels);
+
+                error = NULL;
+                g_file_move (old_accels_file, new_accels_file, 0, NULL, NULL, NULL, &error);
+                if (error) {
+                        g_warning ("Error migrating accelerator specifications file %s: %s\n",
+                                   old_accels, error->message);
+                        g_error_free (error);
+                }
+
+                g_free (new_accels);
+                g_object_unref (old_accels_file);
+                g_object_unref (new_accels_file);
+        }
+
+        g_free (old_accels);
+}
+
 void
 ev_application_shutdown (EvApplication *application)
 {
-       if (application->toolbars_model) {
-               g_object_unref (application->toolbars_model);
-               g_free (application->toolbars_file);
-               application->toolbars_model = NULL;
-               application->toolbars_file = NULL;
+       if (application->uri) {
+#ifdef ENABLE_DBUS
+               ev_application_unregister_uri (application,
+                                              application->uri);
+#endif
+               g_free (application->uri);
+               application->uri = NULL;
        }
 
-#ifdef WITH_GTK_PRINT
-#if GTK_CHECK_VERSION (2, 11, 0)
-       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);
-                       }
+       ev_application_accel_map_save (application);
 
-                       g_object_unref (application->print_settings);
-                       application->print_settings = NULL;
-               }
+       g_object_unref (application->scr_saver);
+       application->scr_saver = NULL;
 
-               g_free (application->print_settings_file);
-               application->print_settings_file = NULL;
+#ifdef ENABLE_DBUS
+       if (application->keys) {
+               g_object_unref (application->keys);
+               application->keys = NULL;
        }
-#else /* ! GTK 2.11.0 */
-       if (application->print_settings) {
-               g_object_unref (application->print_settings);
-               application->print_settings = NULL;
+        if (application->registration_id != 0) {
+                g_dbus_connection_unregister_object (application->connection,
+                                                     application->registration_id);
+                application->registration_id = 0;
+        }
+        if (application->connection != NULL) {
+                g_object_unref (application->connection);
+                application->connection = NULL;
+        }
+       if (introspection_data) {
+               g_dbus_node_info_ref (introspection_data);
+               introspection_data = NULL;
        }
-#endif /* GTK 2.11.0 */
-#endif /* WITH_GTK_PRINT */
+#endif /* ENABLE_DBUS */
        
-       g_free (application->last_chooser_uri);
+        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 ();
 }
@@ -664,158 +1069,183 @@ ev_application_class_init (EvApplicationClass *ev_application_class)
 static void
 ev_application_init (EvApplication *ev_application)
 {
-       gint i;
-       
-#if WITH_GNOME
-       init_session (ev_application);
+       GError *error = NULL;
+
+        ev_application->dot_dir = g_build_filename (g_get_user_config_dir (),
+                                                    "evince", NULL);
+        if (!g_file_test (ev_application->dot_dir, G_FILE_TEST_EXISTS | G_FILE_TEST_IS_DIR))
+                ev_application_migrate_config_dir (ev_application);
+
+#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 (EVINCEDATADIR);
 #endif
 
-       ev_application->toolbars_model = egg_toolbars_model_new ();
+       ev_application_init_session (ev_application);
 
-       ev_application->toolbars_file = g_build_filename
-                       (ev_dot_dir (), "evince_toolbar.xml", NULL);
+       ev_application_accel_map_load (ev_application);
 
-       egg_toolbars_model_load_names (ev_application->toolbars_model,
-                                      DATADIR "/evince-toolbar.xml");
+#ifdef ENABLE_DBUS
+        ev_application->connection = g_bus_get_sync (G_BUS_TYPE_SESSION, NULL, &error);
+        if (ev_application->connection != NULL) {
+                introspection_data = g_dbus_node_info_new_for_xml (introspection_xml, NULL);
+                g_assert (introspection_data != NULL);
+
+                ev_application->registration_id =
+                    g_dbus_connection_register_object (ev_application->connection,
+                                                       APPLICATION_DBUS_OBJECT_PATH,
+                                                       introspection_data->interfaces[0],
+                                                       &interface_vtable,
+                                                       ev_application, NULL,
+                                                       &error);
+                if (ev_application->registration_id == 0) {
+                        g_printerr ("Failed to register bus object: %s\n", error->message);
+                        g_error_free (error);
+                }
+        } else {
+                g_printerr ("Failed to get bus connection: %s\n", error->message);
+                g_error_free (error);
+        }
+
+       ev_application->keys = ev_media_player_keys_new ();
+#endif /* ENABLE_DBUS */
 
-       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");
-       }
+       ev_application->scr_saver = totem_scrsaver_new ();
+       g_object_set (ev_application->scr_saver,
+                     "reason", _("Running in presentation mode"),
+                     NULL);
+}
 
-       /* 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;
-               }
+GDBusConnection *
+ev_application_get_dbus_connection (EvApplication *application)
+{
+#ifdef ENABLE_DBUS
+       return application->connection;
+#else
+       return NULL;
+#endif
+}
+
+gboolean
+ev_application_has_window (EvApplication *application)
+{
+       GList    *l, *toplevels;
+       gboolean  retval = FALSE;
+
+       toplevels = gtk_window_list_toplevels ();
+
+       for (l = toplevels; l != NULL && !retval; l = l->next) {
+               if (EV_IS_WINDOW (l->data))
+                       retval = TRUE;
        }
 
-       egg_toolbars_model_set_flags (ev_application->toolbars_model, 0,
-                                     EGG_TB_MODEL_NOT_REMOVABLE);
+       g_list_free (toplevels);
+
+       return retval;
 }
 
-/**
- * ev_application_get_windows:
- * @application: The instance of the application.
- *
- * It creates a list of the top level windows.
- *
- * Returns: A #GList of the top level windows.
- */
-GList *
-ev_application_get_windows (EvApplication *application)
+guint
+ev_application_get_n_windows (EvApplication *application)
 {
        GList *l, *toplevels;
-       GList *windows = NULL;
+       guint  retval = 0;
 
        toplevels = gtk_window_list_toplevels ();
 
        for (l = toplevels; l != NULL; l = l->next) {
-               if (EV_IS_WINDOW (l->data)) {
-                       windows = g_list_append (windows, l->data);
-               }
+               if (EV_IS_WINDOW (l->data))
+                       retval++;
        }
 
        g_list_free (toplevels);
 
-       return windows;
+       return retval;
 }
 
-EggToolbarsModel *
-ev_application_get_toolbars_model (EvApplication *application)
+const gchar *
+ev_application_get_uri (EvApplication *application)
 {
-       return application->toolbars_model;
+       return application->uri;
 }
 
-void
-ev_application_save_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)
 {
-        egg_toolbars_model_save_toolbars (application->toolbars_model,
-                                         application->toolbars_file, "1.0");
+#ifdef ENABLE_DBUS
+       return G_OBJECT (application->keys);
+#else
+       return NULL;
+#endif /* ENABLE_DBUS */
 }
 
 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
 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)
 {
-       if (application->scr_saver)
-               totem_scrsaver_disable (application->scr_saver);        
+       totem_scrsaver_disable (application->scr_saver);
 }
 
-#ifdef WITH_GTK_PRINT
-GtkPrintSettings *
-ev_application_get_print_settings (EvApplication *application)
+const gchar *
+ev_application_get_dot_dir (EvApplication *application,
+                            gboolean create)
 {
-       if (application->print_settings)
-               return application->print_settings;
-       
-#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 (create)
+                g_mkdir_with_parents (application->dot_dir, 0700);
 
-       if (g_file_test (application->print_settings_file, G_FILE_TEST_IS_REGULAR)) {
-               GError *error = NULL;
-               
-               application->print_settings =
-                       gtk_print_settings_new_from_file (application->print_settings_file, &error);
-               
-               if (error) {
-                       g_warning (error->message);
-                       g_error_free (error);
-               } else {
-                       return application->print_settings;
-               }
-       }
-#endif /* GTK 2.11.0 */
-       
-       application->print_settings = gtk_print_settings_new ();
-
-       return application->print_settings;
+       return application->dot_dir;
 }
 
-void
-ev_application_set_print_settings (EvApplication    *application,
-                                  GtkPrintSettings *settings)
+const gchar *
+ev_application_get_data_dir (EvApplication   *application)
 {
-       g_return_if_fail (GTK_IS_PRINT_SETTINGS (settings));
-       
-       if (settings == application->print_settings)
-               return;
-
-       if (application->print_settings)
-               g_object_unref (application->print_settings);
-       
-       application->print_settings = g_object_ref (settings);
+       return application->data_dir;
 }
-#endif /* WITH_GTK_PRINT */