]> www.fi.muni.cz Git - evince.git/blobdiff - shell/ev-application.c
Replace GTK_WIDGET_REALIZED() with gtk_widget_get_realized()
[evince.git] / shell / ev-application.c
index 7ad13820dd9d8f2de408a93d0edde90f29d9c83b..b14a8a403869a02cbd5a593e305cd3065dad00af 100644 (file)
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
  */
 
+
 #include <config.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include <glib.h>
+#include <glib/gi18n.h>
+#include <glib/gstdio.h>
+#include <gtk/gtk.h>
+#ifdef GDK_WINDOWING_X11
+#include <gdk/gdkx.h>
+#endif
+#include <unistd.h>
+
+#include "totem-scrsaver.h"
+
+#ifdef WITH_SMCLIENT
+#include "eggsmclient.h"
+#endif
+
 #include "ev-application.h"
-#include "ev-utils.h"
 #include "ev-file-helpers.h"
-#include "ev-document-factory.h"
+#include "ev-stock-icons.h"
+
 #ifdef ENABLE_DBUS
 #include "ev-media-player-keys.h"
 #endif /* ENABLE_DBUS */
-#include "totem-scrsaver.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>
-#endif
 
 #ifdef ENABLE_DBUS
-#include "ev-application-service.h"
 #include <dbus/dbus-glib-bindings.h>
+static gboolean ev_application_open_uri (EvApplication  *application,
+                                        const char     *uri,
+                                        GHashTable     *args,
+                                        guint           timestamp,
+                                        GError        **error);
+#include "ev-application-service.h"
 #endif
 
-#include <string.h>
-
-static void ev_application_add_icon_path_for_screen (GdkScreen *screen);
-
 struct _EvApplication {
        GObject base_instance;
 
-       gchar *toolbars_file;
+       gchar *uri;
 
-       EggToolbarsModel *toolbars_model;
-
-       TotemScrsaver *scr_saver;
-
-       gchar *last_chooser_uri;
+       gchar *dot_dir;
+       gchar *data_dir;
 
 #ifdef ENABLE_DBUS
+       DBusGConnection *connection;
        EvMediaPlayerKeys *keys;
-#endif /* ENABLE_DBUS */
+#endif
 
-       GtkPrintSettings *print_settings;
-#if GTK_CHECK_VERSION (2, 11, 0)
-       gchar            *print_settings_file;
+       TotemScrsaver *scr_saver;
+
+#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);
-
-               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;
-       }
-
-       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 */
+#define APPLICATION_DBUS_OBJECT_PATH "/org/gnome/evince/Evince"
+#define APPLICATION_DBUS_INTERFACE   "org.gnome.evince.Application"
+#endif
 
 /**
  * ev_application_get_instance:
@@ -143,8 +104,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));
        }
@@ -152,55 +111,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)
-{
-       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));
-       }
+/* Session */
+gboolean
+ev_application_load_session (EvApplication *application)
+{
+       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:
@@ -340,103 +314,185 @@ get_find_string_from_args (GHashTable *args)
        return value ? g_value_get_string (value) : NULL;
 }
 
-/**
- * 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;
+static void
+value_free (GValue *value)
+{
+       g_value_unset (value);
+       g_free (value);
+}
+
+static GHashTable *
+build_args (GdkScreen      *screen,
+           EvLinkDest     *dest,
+           EvWindowRunMode mode,
+           const gchar    *search_string)
+{
+       GHashTable  *args;
+       GValue      *value;
+       GdkDisplay  *display;
+       const gchar *display_name;
+       gint         screen_number;
+
+       args = g_hash_table_new_full (g_str_hash,
+                                     g_str_equal,
+                                     (GDestroyNotify)g_free,
+                                     (GDestroyNotify)value_free);
+
+       /* Display */
+       display = gdk_screen_get_display (screen);
+       display_name = gdk_display_get_name (display);
+       value = g_new0 (GValue, 1);
+       g_value_init (value, G_TYPE_STRING);
+       g_value_set_string (value, display_name);
+       g_hash_table_insert (args, g_strdup ("display"), value);
+
+       /* Screen */
+       screen_number = gdk_screen_get_number (screen);
+       value = g_new0 (GValue, 1);
+       g_value_init (value, G_TYPE_INT);
+       g_value_set_int (value, screen_number);
+       g_hash_table_insert (args, g_strdup ("screen"), value);
+
+       /* Page label */
+       if (dest) {
+               value = g_new0 (GValue, 1);
+               g_value_init (value, G_TYPE_STRING);
+               g_value_set_string (value, ev_link_dest_get_page_label (dest));
+
+               g_hash_table_insert (args, g_strdup ("page-label"), value);
+       }
 
-       g_assert (args != NULL);
+       /* Find string */
+       if (search_string) {
+               value = g_new0 (GValue, 1);
+               g_value_init (value, G_TYPE_STRING);
+               g_value_set_string (value, search_string);
 
-       value = g_hash_table_lookup (args, "unlink-temp-file");
-       if (value) {
-               unlink_temp_file = g_value_get_boolean (value);
+               g_hash_table_insert (args, g_strdup ("find-string"), value);
        }
-       
-       return unlink_temp_file;
+
+       /* Mode */
+       if (mode != EV_WINDOW_MODE_NORMAL) {
+               value = g_new0 (GValue, 1);
+               g_value_init (value, G_TYPE_UINT);
+               g_value_set_uint (value, mode);
+
+               g_hash_table_insert (args, g_strdup ("mode"), value);
+       }
+
+       return args;
 }
 
-static const gchar *
-get_print_settings_from_args (GHashTable *args)
+static void
+child_setup (gpointer user_data)
 {
-       const gchar *print_settings = NULL;
-       GValue      *value = NULL;
+       gchar *startup_id;
 
-       g_assert (args != NULL);
+       startup_id = g_strdup_printf ("_TIME%lu",
+                                     (unsigned long)GPOINTER_TO_INT (user_data));
+       g_setenv ("DESKTOP_STARTUP_ID", startup_id, TRUE);
+       g_free (startup_id);
+}
 
-       value = g_hash_table_lookup (args, "print-settings");
-       if (value) {
-               print_settings = g_value_get_string (value);
+static void
+ev_spawn (const char     *uri,
+         GdkScreen      *screen,
+         EvLinkDest     *dest,
+         EvWindowRunMode mode,
+         const gchar    *search_string,
+         guint           timestamp)
+{
+       gchar   *argv[6];
+       guint    arg = 0;
+       gint     i;
+       gboolean res;
+       GError  *error = NULL;
+
+#ifdef G_OS_WIN32
+{
+       gchar *dir;
+
+       dir = g_win32_get_package_installation_directory_of_module (NULL);
+       argv[arg++] = g_build_filename (dir, "bin", "evince", NULL);
+       g_free (dir);
+}
+#else
+       argv[arg++] = g_build_filename (BINDIR, "evince", NULL);
+#endif
+
+       /* Page label */
+       if (dest) {
+               const gchar *page_label;
+
+               page_label = ev_link_dest_get_page_label (dest);
+               if (page_label)
+                       argv[arg++] = g_strdup_printf ("--page-label=%s", page_label);
+               else
+                       argv[arg++] = g_strdup_printf ("--page-label=%d",
+                                                      ev_link_dest_get_page (dest));
        }
 
-       return print_settings;
+       /* Find string */
+       if (search_string) {
+               argv[arg++] = g_strdup_printf ("--find=%s", search_string);
+       }
+
+       /* Mode */
+       switch (mode) {
+       case EV_WINDOW_MODE_FULLSCREEN:
+               argv[arg++] = g_strdup ("-f");
+               break;
+       case EV_WINDOW_MODE_PRESENTATION:
+               argv[arg++] = g_strdup ("-s");
+               break;
+       default:
+               break;
+       }
+
+       argv[arg++] = (gchar *)uri;
+       argv[arg] = NULL;
+
+       res = gdk_spawn_on_screen (screen, NULL /* wd */, argv, NULL /* env */,
+                                  0,
+                                  child_setup,
+                                  GINT_TO_POINTER(timestamp),
+                                  NULL, &error);
+       if (!res) {
+               g_warning ("Error launching evince %s: %s\n", uri, error->message);
+               g_error_free (error);
+       }
+
+       for (i = 0; i < arg - 1; i++) {
+               g_free (argv[i]);
+       }
 }
 
-/**
- * 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)
+static GList *
+ev_application_get_windows (EvApplication *application)
 {
-       GtkWidget *new_window = ev_window_new ();
-       GdkScreen *screen = NULL;
+       GList *l, *toplevels;
+       GList *windows = NULL;
 
-       if (args) {
-               screen = get_screen_from_args (args);
-       }
-       
-       if (screen) {
-               gtk_window_set_screen (GTK_WINDOW (new_window), screen);
+       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);
+               }
        }
-       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;
+
+       g_list_free (toplevels);
+
+       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);
@@ -449,77 +505,136 @@ 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.
- *
- * 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.
- *
- * 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)
-{
-       EvWindow *uri_window = NULL;
-       GList *windows = gtk_window_list_toplevels ();
-       GList *l;
 
-       g_return_val_if_fail (uri != NULL, NULL);
-
-       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 (window_uri && strcmp (window_uri, uri) == 0 && !ev_window_is_empty (window)) {
-                               uri_window = window;
-                               break;
+#ifdef ENABLE_DBUS
+static gboolean
+ev_application_register_uri (EvApplication *application,
+                            const gchar   *uri,
+                            GHashTable    *args,
+                            guint          timestamp)
+{
+       DBusGProxy *proxy;
+       gchar      *owner;
+       gboolean    retval = TRUE;
+       GError     *error = NULL;
+
+       if (!application->connection)
+               return TRUE;
+
+       proxy = dbus_g_proxy_new_for_name (application->connection,
+                                          "org.gnome.evince.Daemon",
+                                          "/org/gnome/evince/Daemon",
+                                          "org.gnome.evince.Daemon");
+       if (!dbus_g_proxy_call (proxy, "RegisterDocument", &error,
+                               G_TYPE_STRING, uri,
+                               G_TYPE_INVALID,
+                               G_TYPE_STRING, &owner,
+                               G_TYPE_INVALID)) {
+               g_warning ("Error registering document: %s\n", error->message);
+               g_error_free (error);
+               g_object_unref (proxy);
+
+               return TRUE;
+       }
+       g_object_unref (proxy);
+
+       if (*owner == ':') {
+               /* Already registered */
+               proxy = dbus_g_proxy_new_for_name_owner (application->connection,
+                                                        owner,
+                                                        APPLICATION_DBUS_OBJECT_PATH,
+                                                        APPLICATION_DBUS_INTERFACE,
+                                                        &error);
+               if (proxy) {
+                       if (!dbus_g_proxy_call (proxy, "OpenURI", &error,
+                                               G_TYPE_STRING, uri,
+                                               dbus_g_type_get_map ("GHashTable", G_TYPE_STRING, G_TYPE_VALUE), args,
+                                               G_TYPE_UINT, timestamp,
+                                               G_TYPE_INVALID,
+                                               G_TYPE_INVALID)) {
+                               g_warning ("%s", error->message);
+                               g_error_free (error);
                        }
+                       g_object_unref (proxy);
+               } else {
+                       g_warning ("Error creating proxy: %s\n", error->message);
+                       g_error_free (error);
                }
+
+               /* Do not continue opening this document */
+               retval = FALSE;
        }
 
-       g_list_free (windows);
-       
-       return uri_window;
+       g_free (owner);
+
+       return retval;
 }
 
 static void
-ev_application_add_icon_path_for_screen (GdkScreen *screen)
+ev_application_unregister_uri (EvApplication *application,
+                              const gchar   *uri)
 {
-       GtkIconTheme *icon_theme;
+       DBusGProxy *proxy;
+       GError     *error = 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;
+       if (!application->connection)
+               return;
 
-               /* 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;
-               }
+       proxy = dbus_g_proxy_new_for_name (application->connection,
+                                          "org.gnome.evince.Daemon",
+                                          "/org/gnome/evince/Daemon",
+                                          "org.gnome.evince.Daemon");
+       if (!dbus_g_proxy_call (proxy, "UnregisterDocument", &error,
+                               G_TYPE_STRING, uri,
+                               G_TYPE_INVALID,
+                               G_TYPE_INVALID)) {
+               g_warning ("Error unregistering document: %s\n", error->message);
+               g_error_free (error);
+       }
 
-               if (i < 0)
-                       gtk_icon_theme_append_search_path (icon_theme,
-                                                          ev_icons_path);
+       g_object_unref (proxy);
+}
+#endif /* ENABLE_DBUS */
 
-               g_free (ev_icons_path);
-               g_strfreev (path);
-       }       
+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)
+{
+       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
+       if (timestamp <= 0)
+               timestamp = gdk_x11_get_server_time (GTK_WIDGET (ev_window)->window);
+       gdk_x11_window_set_user_time (GTK_WIDGET (ev_window)->window, timestamp);
+
+       ev_document_fc_mutex_lock ();
+       gtk_window_present (GTK_WINDOW (ev_window));
+       ev_document_fc_mutex_unlock ();
+#else
+       ev_document_fc_mutex_lock ();
+       gtk_window_present_with_time (GTK_WINDOW (ev_window), timestamp);
+       ev_document_fc_mutex_unlock ();
+#endif /* GDK_WINDOWING_X11 */
 }
 
 /**
@@ -529,7 +644,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
@@ -539,40 +653,74 @@ ev_application_open_uri_at_dest (EvApplication  *application,
                                 EvLinkDest     *dest,
                                 EvWindowRunMode mode,
                                 const gchar    *search_string,
-                                gboolean        unlink_temp_file,
-                                const gchar    *print_settings, 
                                 guint           timestamp)
 {
-       EvWindow *new_window;
+       EvWindow *ev_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 {
+#ifdef ENABLE_DBUS
+               GHashTable *args = build_args (screen, dest, mode, search_string);
+               gboolean    ret;
 
-       if (new_window == NULL) {
-               new_window = EV_WINDOW (ev_window_new ());
+               /* Register the uri or send OpenURI to
+                * remote instance if already registered
+                */
+               ret = ev_application_register_uri (application, uri, args, timestamp);
+               g_hash_table_destroy (args);
+               if (!ret)
+                       return;
+#endif /* ENABLE_DBUS */
+
+               ev_window = ev_application_get_empty_window (application, screen);
+               if (!ev_window)
+                       ev_window = EV_WINDOW (ev_window_new ());
        }
 
-       if (screen)
+       application->uri = g_strdup (uri);
+
+       ev_application_open_uri_in_window (application, uri, ev_window,
+                                          screen, dest, mode,
+                                          search_string,
+                                          timestamp);
+}
+
+/**
+ * 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 ();
+
+       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, search_string, 
-                           unlink_temp_file, print_settings);
+       if (!gtk_widget_get_realized (new_window))
+               gtk_widget_realize (new_window);
 
-       ev_document_fc_mutex_lock ();
-       gtk_widget_show (GTK_WIDGET (new_window));
-       ev_document_fc_mutex_unlock ();
+#ifdef GDK_WINDOWING_X11
+       if (timestamp <= 0)
+               timestamp = gdk_x11_get_server_time (new_window->window);
+       gdk_x11_window_set_user_time (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 */
 }
 
 /**
@@ -583,34 +731,48 @@ ev_application_open_uri_at_dest (EvApplication  *application,
  * @timestamp: Current time value.
  * @error: The #GError facility.
  */
-gboolean
+static gboolean
 ev_application_open_uri (EvApplication  *application,
                         const char     *uri,
                         GHashTable     *args,
                         guint           timestamp,
                         GError        **error)
 {
+       GList           *windows, *l;
        EvLinkDest      *dest = NULL;
        EvWindowRunMode  mode = EV_WINDOW_MODE_NORMAL;
        const gchar     *search_string = NULL;
-       gboolean         unlink_temp_file = FALSE;
-       const gchar     *print_settings = NULL;
        GdkScreen       *screen = NULL;
 
+       g_assert (application->uri != NULL);
+
+       /* FIXME: we don't need uri anymore,
+        * maybe this method should be renamed
+        * as reload, refresh or something like that
+        */
+       if (!application->uri || strcmp (application->uri, uri)) {
+               g_warning ("Invalid uri: %s, expected %s\n",
+                          uri, application->uri);
+               return TRUE;
+       }
+
        if (args) {
                screen = get_screen_from_args (args);
                dest = get_destination_from_args (args);
                mode = get_window_run_mode_from_args (args);
                search_string = get_find_string_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, search_string,
-                                        unlink_temp_file,
-                                        print_settings, timestamp);
+
+       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);
 
        if (dest)
                g_object_unref (dest);
@@ -629,49 +791,89 @@ 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, NULL,
-                                                FALSE, NULL, timestamp);
+                                                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 (g_get_home_dir (),
+                                          ".gnome2", "accels",
+                                          "evince", 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);
+
+       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 (g_get_home_dir (),
+                                          ".gnome2", "accels",
+                                          "evince", NULL);
+       gtk_accel_map_load (accel_map_file);
+       g_free (accel_map_file);
+}
+
 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 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 ("%s", error->message);
-                               g_error_free (error);
-                       }
+       if (application->uri) {
+#ifdef ENABLE_DBUS
+               ev_application_unregister_uri (application,
+                                              application->uri);
+#endif
+               g_free (application->uri);
+               application->uri = NULL;
+       }
 
-                       g_object_unref (application->print_settings);
-                       application->print_settings = NULL;
-               }
+       ev_application_accel_map_save (application);
 
-               g_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;
+       g_object_unref (application->scr_saver);
+       application->scr_saver = NULL;
+
+#ifdef ENABLE_DBUS
+       if (application->keys) {
+               g_object_unref (application->keys);
+               application->keys = NULL;
        }
-#endif /* GTK 2.11.0 */
+#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 ();
 }
@@ -679,80 +881,69 @@ ev_application_shutdown (EvApplication *application)
 static void
 ev_application_class_init (EvApplicationClass *ev_application_class)
 {
+#ifdef ENABLE_DBUS
+       dbus_g_object_type_install_info (EV_TYPE_APPLICATION,
+                                        &dbus_glib_ev_application_object_info);
+#endif
 }
 
 static void
 ev_application_init (EvApplication *ev_application)
 {
-       gint i;
-       
-#if WITH_GNOME
-       init_session (ev_application);
-#endif
+       GError *error = NULL;
 
-       ev_application->toolbars_model = egg_toolbars_model_new ();
+        ev_application->dot_dir = g_build_filename (g_get_home_dir (),
+                                                    ".gnome2",
+                                                    "evince",
+                                                    NULL);
 
-       ev_application->toolbars_file = g_build_filename
-                       (ev_dot_dir (), "evince_toolbar.xml", NULL);
+#ifdef G_OS_WIN32
+{
+       gchar *dir;
 
-       egg_toolbars_model_load_names (ev_application->toolbars_model,
-                                      DATADIR "/evince-toolbar.xml");
+       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
 
-       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_init_session (ev_application);
 
-       /* 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;
-               }
-       }
+       ev_application_accel_map_load (ev_application);
 
-       egg_toolbars_model_set_flags (ev_application->toolbars_model, 0,
-                                     EGG_TB_MODEL_NOT_REMOVABLE);
+       ev_application->scr_saver = totem_scrsaver_new ();
 
 #ifdef ENABLE_DBUS
+       ev_application->connection = dbus_g_bus_get (DBUS_BUS_STARTER, &error);
+       if (ev_application->connection) {
+               dbus_g_connection_register_g_object (ev_application->connection,
+                                                    APPLICATION_DBUS_OBJECT_PATH,
+                                                    G_OBJECT (ev_application));
+       } else {
+               g_warning ("Error connection to DBus: %s\n", error->message);
+               g_error_free (error);
+       }
        ev_application->keys = ev_media_player_keys_new ();
 #endif /* ENABLE_DBUS */
 }
 
-/**
- * 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)
+gboolean
+ev_application_has_window (EvApplication *application)
 {
-       GList *l, *toplevels;
-       GList *windows = NULL;
-
-       toplevels = gtk_window_list_toplevels ();
+       GList   *windows = ev_application_get_windows (application);
+       gboolean retval = windows != NULL;
 
-       for (l = toplevels; l != NULL; l = l->next) {
-               if (EV_IS_WINDOW (l->data)) {
-                       windows = g_list_append (windows, l->data);
-               }
-       }
+       g_list_free (windows);
 
-       g_list_free (toplevels);
+       return retval;
+}
 
-       return windows;
+const gchar *
+ev_application_get_uri (EvApplication *application)
+{
+       return application->uri;
 }
 
 /**
@@ -763,102 +954,69 @@ ev_application_get_windows (EvApplication *application)
  *
  * Returns: A #EvMediaPlayerKeys.
  */
-GObject
-*ev_application_get_media_keys (EvApplication *application)
+GObject *
+ev_application_get_media_keys (EvApplication *application)
 {
 #ifdef ENABLE_DBUS
-       if (!application->keys)
-               return NULL;
-       return g_object_ref (G_OBJECT (application->keys));
+       return G_OBJECT (application->keys);
 #else
        return NULL;
 #endif /* ENABLE_DBUS */
 }
 
-EggToolbarsModel *
-ev_application_get_toolbars_model (EvApplication *application)
-{
-       return application->toolbars_model;
-}
-
 void
-ev_application_save_toolbars_model (EvApplication *application)
-{
-        egg_toolbars_model_save_toolbars (application->toolbars_model,
-                                         application->toolbars_file, "1.0");
-}
-
-void
-ev_application_set_chooser_uri (EvApplication *application, const gchar *uri)
-{
-       g_free (application->last_chooser_uri);
-       application->last_chooser_uri = g_strdup (uri);
+ev_application_set_filechooser_uri (EvApplication       *application,
+                                   GtkFileChooserAction action,
+                                   const gchar         *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)
-{
-       return application->last_chooser_uri;
+ev_application_get_filechooser_uri (EvApplication       *application,
+                                   GtkFileChooserAction action)
+{
+       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);
 }
 
-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 ("%s", 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;
 }
-