X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;f=shell%2Fev-application.c;h=caa943b855d78d8f2373c2ed008239e965df8659;hb=6a34ad367a49ad20710d3b575b5fa21182164fa9;hp=24ef1e0984ee26b982b5bde4c560332df1afed8a;hpb=ba540cc933501c25ee8caddc9225b782e0fec8ae;p=evince.git diff --git a/shell/ev-application.c b/shell/ev-application.c index 24ef1e09..caa943b8 100644 --- a/shell/ev-application.c +++ b/shell/ev-application.c @@ -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 @@ -17,20 +18,22 @@ * * 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 +#include #include #include #include #include +#include #include #ifdef GDK_WINDOWING_X11 #include #endif +#include #include "totem-scrsaver.h" @@ -39,43 +42,28 @@ #endif #include "ev-application.h" -#include "ev-document-factory.h" #include "ev-file-helpers.h" -#include "ev-utils.h" #include "ev-stock-icons.h" #ifdef ENABLE_DBUS #include "ev-media-player-keys.h" #endif /* ENABLE_DBUS */ -#ifdef ENABLE_DBUS -#include -static gboolean ev_application_open_uri (EvApplication *application, - const char *uri, - GHashTable *args, - guint timestamp, - GError **error); -#include "ev-application-service.h" -#endif - -static void ev_application_save_print_settings (EvApplication *application); - struct _EvApplication { GObject base_instance; + gchar *uri; + gchar *dot_dir; gchar *data_dir; - gchar *accel_map_file; - gchar *toolbars_file; #ifdef ENABLE_DBUS - DBusGConnection *connection; - GHashTable *windows; - guint doc_counter; + GDBusConnection *connection; + guint registration_id; + EvMediaPlayerKeys *keys; + gboolean doc_registered; #endif - EggToolbarsModel *toolbars_model; - TotemScrsaver *scr_saver; #ifdef WITH_SMCLIENT @@ -84,14 +72,6 @@ struct _EvApplication { gchar *filechooser_open_uri; gchar *filechooser_save_uri; - -#ifdef ENABLE_DBUS - EvMediaPlayerKeys *keys; -#endif /* ENABLE_DBUS */ - - GtkPrintSettings *print_settings; - GtkPageSetup *page_setup; - GKeyFile *print_settings_file; }; struct _EvApplicationClass { @@ -105,11 +85,27 @@ G_DEFINE_TYPE (EvApplication, ev_application, G_TYPE_OBJECT); #ifdef ENABLE_DBUS #define APPLICATION_DBUS_OBJECT_PATH "/org/gnome/evince/Evince" #define APPLICATION_DBUS_INTERFACE "org.gnome.evince.Application" + +#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 -#define EV_PRINT_SETTINGS_FILE "print-settings" -#define EV_PRINT_SETTINGS_GROUP "Print Settings" -#define EV_PAGE_SETUP_GROUP "Page Setup" +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: @@ -128,43 +124,12 @@ ev_application_get_instance (void) return instance; } -#if defined (WITH_SMCLIENT) /* Session */ -static void -save_session (EvApplication *application, - GList *windows_list, - GKeyFile *state_file) -{ - GList *l; - gint i; - const gchar **uri_list; - const gchar *empty = "empty-window"; - - uri_list = g_new (const gchar *, g_list_length (windows_list)); - for (l = windows_list, i = 0; l != NULL; l = g_list_next (l), i++) { - EvWindow *window = EV_WINDOW (l->data); - - if (ev_window_is_empty (window)) - uri_list[i] = empty; - else - uri_list[i] = ev_window_get_uri (window); - } - g_key_file_set_string_list (state_file, - "Evince", - "documents", - (const char **)uri_list, - i); - g_free (uri_list); -} - -#endif /* WITH_SMCLIENT */ - gboolean -ev_application_load_session (EvApplication *application, - const gchar **files) +ev_application_load_session (EvApplication *application) { GKeyFile *state_file; - gchar **uri_list; + gchar *uri; #ifdef WITH_SMCLIENT if (egg_sm_client_is_resumed (application->smclient)) { @@ -175,23 +140,15 @@ ev_application_load_session (EvApplication *application, #endif /* WITH_SMCLIENT */ return FALSE; - uri_list = g_key_file_get_string_list (state_file, - "Evince", - "documents", - NULL, NULL); - if (uri_list) { - gint i; - GdkScreen *screen = gdk_screen_get_default (); - - for (i = 0; uri_list[i]; i++) { - if (g_ascii_strcasecmp (uri_list[i], "empty-window") == 0) - ev_application_open_window (application, screen, GDK_CURRENT_TIME); - else - ev_application_open_uri_at_dest (application, uri_list[i], screen, - NULL, 0, NULL, GDK_CURRENT_TIME); - } - g_strfreev (uri_list); - } + uri = g_key_file_get_string (state_file, "Evince", "uri", NULL); + if (!uri) + return FALSE; + + 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); return TRUE; @@ -204,13 +161,10 @@ smclient_save_state_cb (EggSMClient *client, GKeyFile *state_file, EvApplication *application) { - GList *windows; + if (!application->uri) + return; - windows = ev_application_get_windows (application); - if (windows) { - save_session (application, windows, state_file); - g_list_free (windows); - } + g_key_file_set_string (state_file, "Evince", "uri", application->uri); } static void @@ -219,7 +173,6 @@ smclient_quit_cb (EggSMClient *client, { ev_application_shutdown (application); } - #endif /* WITH_SMCLIENT */ static void @@ -268,231 +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; -} - -/** - * 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) -{ - EvWindowRunMode mode = EV_WINDOW_MODE_NORMAL; - GValue *value = NULL; + cmd = g_string_new (NULL); - g_assert (args != NULL); - - value = g_hash_table_lookup (args, "mode"); - if (value) { - mode = g_value_get_uint (value); - } - - return mode; -} - -/** - * 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) +#ifdef G_OS_WIN32 { - EvLinkDest *dest = NULL; - GValue *value = NULL; - - g_assert (args != NULL); - - value = g_hash_table_lookup (args, "page-label"); - if (value) { - const gchar *page_label; + gchar *dir; - page_label = g_value_get_string (value); - dest = ev_link_dest_new_page_label (page_label); - } + dir = g_win32_get_package_installation_directory_of_module (NULL); + path = g_build_filename (dir, "bin", "evince", NULL); - return dest; + g_free (dir); } +#else + path = g_build_filename (BINDIR, "evince", NULL); +#endif -static const gchar * -get_find_string_from_args (GHashTable *args) -{ - GValue *value = NULL; - - g_assert (args != NULL); - - value = g_hash_table_lookup (args, "find-string"); + g_string_append_printf (cmd, " %s", path); + g_free (path); - return value ? g_value_get_string (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)); + const gchar *page_label; - g_hash_table_insert (args, g_strdup ("page-label"), value); + 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)); } /* Find string */ if (search_string) { - value = g_new0 (GValue, 1); - g_value_init (value, G_TYPE_STRING); - g_value_set_string (value, search_string); - - g_hash_table_insert (args, g_strdup ("find-string"), value); + g_string_append_printf (cmd, " --find=%s", search_string); } /* 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); + 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; + } + + 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); + } - g_hash_table_insert (args, g_strdup ("mode"), value); + if (error != NULL) { + g_warning ("Error launching evince %s: %s\n", uri, error->message); + g_error_free (error); } - return args; + g_free (cmdline); } -/** - * 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) +static GList * +ev_application_get_windows (EvApplication *application) { - GtkWidget *new_window = ev_window_new (); + GList *l, *toplevels; + GList *windows = NULL; - if (screen) { - ev_stock_icons_set_screen (screen); - gtk_window_set_screen (GTK_WINDOW (new_window), screen); - } + toplevels = gtk_window_list_toplevels (); - if (!GTK_WIDGET_REALIZED (new_window)) - gtk_widget_realize (new_window); + for (l = toplevels; l != NULL; l = l->next) { + if (EV_IS_WINDOW (l->data)) { + windows = g_list_append (windows, l->data); + } + } -#ifdef GDK_WINDOWING_X11 - if (timestamp <= 0) - timestamp = gdk_x11_get_server_time (GTK_WIDGET (new_window)->window); - gdk_x11_window_set_user_time (GTK_WIDGET (new_window)->window, timestamp); + g_list_free (toplevels); - gtk_window_present (GTK_WINDOW (new_window)); -#else - gtk_window_present_with_time (GTK_WINDOW (new_window), timestamp); -#endif /* GDK_WINDOWING_X11 */ + 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); @@ -505,145 +354,261 @@ 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) + +#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) { - EvWindow *uri_window = NULL; - GList *windows = gtk_window_list_toplevels (); - GList *l; + if (!data) + return; - g_return_val_if_fail (uri != NULL, NULL); + g_free (data->uri); + if (data->search_string) + g_free (data->search_string); + if (data->dest) + g_object_unref (data->dest); - 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); + g_free (data); +} - if (window_uri && strcmp (window_uri, uri) == 0 && !ev_window_is_empty (window)) { - uri_window = window; - break; - } - } +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); - g_list_free (windows); - - return uri_window; + /* We did not open a window, so manually clear the startup + * notification. */ + gdk_notify_startup_complete (); + + ev_application_shutdown (EV_APP); } -#ifdef ENABLE_DBUS -static gboolean -ev_application_register_uri (EvApplication *application, - const gchar *uri, - GHashTable *args, - guint timestamp) +static void +on_register_uri_cb (GObject *source_object, + GAsyncResult *res, + gpointer user_data) { - 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)) { + 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); - 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); - } + _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); - /* Do not continue opening this document */ - retval = FALSE; + return; } - g_free (owner); - - return retval; + 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: + * + * Registers @uri with evince-daemon. + * + */ static void -ev_application_unregister_uri (EvApplication *application, - const gchar *uri) +ev_application_register_uri (EvApplication *application, + const gchar *uri, + GdkScreen *screen, + EvLinkDest *dest, + EvWindowRunMode mode, + const gchar *search_string, + guint timestamp) { - DBusGProxy *proxy; - GError *error = NULL; + EvRegisterDocData *data; if (!application->connection) return; - 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 (application->doc_registered) { + /* Already registered, reload */ + GList *windows, *l; + + 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_object_unref (proxy); + 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_window_destroyed (EvApplication *application, - EvWindow *ev_window) +ev_application_unregister_uri (EvApplication *application, + const gchar *uri) { - gchar *uri = g_hash_table_lookup (application->windows, ev_window); + GVariant *value; + GError *error = NULL; - ev_application_unregister_uri (application, uri); - g_hash_table_remove (application->windows, ev_window); + 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 */ @@ -657,6 +622,10 @@ ev_application_open_uri_in_window (EvApplication *application, 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); @@ -666,34 +635,43 @@ ev_application_open_uri_in_window (EvApplication *application, we can restore window size without flickering */ ev_window_open_uri (ev_window, uri, dest, mode, search_string); -#ifdef ENABLE_DBUS - if (application->windows != NULL && - !g_hash_table_lookup (application->windows, ev_window)) { - g_hash_table_insert (application->windows, ev_window, g_strdup (uri)); - g_signal_connect_swapped (ev_window, "destroy", - G_CALLBACK (ev_application_window_destroyed), - application); - } -#endif - - if (!GTK_WIDGET_REALIZED (GTK_WIDGET (ev_window))) + 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 (GTK_WIDGET (ev_window)->window); - gdk_x11_window_set_user_time (GTK_WIDGET (ev_window)->window, timestamp); + timestamp = gdk_x11_get_server_time (gdk_window); + gdk_x11_window_set_user_time (gdk_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 */ } +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 ()); + + ev_application_open_uri_in_window (application, uri, ev_window, + screen, dest, mode, + search_string, + timestamp); +} + /** * ev_application_open_uri_at_dest: * @application: The instance of the application. @@ -712,80 +690,174 @@ ev_application_open_uri_at_dest (EvApplication *application, const gchar *search_string, guint timestamp) { - EvWindow *ev_window; - g_return_if_fail (uri != NULL); - ev_window = ev_application_get_uri_window (application, uri); -#ifdef ENABLE_DBUS - if (!ev_window) { - GHashTable *args = build_args (screen, dest, mode, search_string); - gboolean ret; - - /* 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 */ - - if (ev_window == NULL) { - ev_window = ev_application_get_empty_window (application, screen); - } - - if (ev_window == NULL) { - ev_window = EV_WINDOW (ev_window_new ()); + 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); } - ev_application_open_uri_in_window (application, uri, ev_window, - screen, dest, mode, search_string, - timestamp); +#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_uri: + * ev_application_open_window: * @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. + * + * Creates a new window */ -static gboolean -ev_application_open_uri (EvApplication *application, - const char *uri, - GHashTable *args, - guint timestamp, - GError **error) +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) { + ev_stock_icons_set_screen (screen); + gtk_window_set_screen (GTK_WINDOW (new_window), screen); + } + + 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)); + + 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 (new_window)); +#else + gtk_window_present_with_time (GTK_WINDOW (new_window), timestamp); +#endif /* GDK_WINDOWING_X11 */ +} + +#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) { - EvWindow *ev_window; + 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; const gchar *search_string = NULL; GdkScreen *screen = NULL; - ev_window = ev_application_get_uri_window (application, uri); - g_assert (ev_window != NULL); + if (g_strcmp0 (method_name, "Reload") == 0) { + g_variant_get (parameters, "(a{sv}u)", &iter, ×tamp); + + 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 (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); - } + 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 (); - ev_application_open_uri_in_window (application, uri, ev_window, - screen, dest, mode, search_string, - timestamp); + windows = ev_application_get_windows (application); + for (l = windows; l != NULL; l = g_list_next (l)) { + EvWindow *ev_window = EV_WINDOW (l->data); - if (dest) - g_object_unref (dest); + ev_application_open_uri_in_window (application, application->uri, + ev_window, + screen, dest, mode, + search_string, + timestamp); + } + g_list_free (windows); - return TRUE; + if (dest) + g_object_unref (dest); + + 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[] = + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + ""; + +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, @@ -801,51 +873,177 @@ ev_application_open_uri_list (EvApplication *application, } } -void -ev_application_shutdown (EvApplication *application) +static void +ev_application_accel_map_save (EvApplication *application) { -#ifdef ENABLE_DBUS - if (application->windows) { - g_hash_table_destroy (application->windows); - application->windows = NULL; - } -#endif + gchar *accel_map_file; + gchar *tmp_filename; + gint fd; - if (application->accel_map_file) { - gtk_accel_map_save (application->accel_map_file); - g_free (application->accel_map_file); - application->accel_map_file = NULL; - } - - if (application->toolbars_model) { - g_object_unref (application->toolbars_model); - g_free (application->toolbars_file); - application->toolbars_model = NULL; - application->toolbars_file = NULL; - } + accel_map_file = g_build_filename (application->dot_dir, "accels", NULL); + tmp_filename = g_strdup_printf ("%s.XXXXXX", accel_map_file); - ev_application_save_print_settings (application); - - if (application->print_settings_file) { - g_key_file_free (application->print_settings_file); - application->print_settings_file = NULL; + 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 (application->print_settings) { - g_object_unref (application->print_settings); - application->print_settings = NULL; + g_mkdir_with_parents (application->dot_dir, 0700); + if (g_rename (tmp_filename, accel_map_file) == -1) { + /* FIXME: win32? */ + g_unlink (tmp_filename); } - if (application->page_setup) { - g_object_unref (application->page_setup); - application->page_setup = NULL; + 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->uri) { +#ifdef ENABLE_DBUS + ev_application_unregister_uri (application, + application->uri); +#endif + g_free (application->uri); + application->uri = NULL; } + ev_application_accel_map_save (application); + + g_object_unref (application->scr_saver); + application->scr_saver = NULL; + #ifdef ENABLE_DBUS if (application->keys) { g_object_unref (application->keys); application->keys = 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 /* ENABLE_DBUS */ g_free (application->dot_dir); @@ -866,28 +1064,17 @@ 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; - const gchar *home_dir; - gchar *toolbar_path; GError *error = NULL; - ev_application->dot_dir = g_build_filename (g_get_home_dir (), - ".gnome2", - "evince", - NULL); - - /* FIXME: why make this fatal? */ - if (!ev_dir_ensure_exists (ev_application->dot_dir, 0700)) - exit (1); + 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 { @@ -898,101 +1085,94 @@ ev_application_init (EvApplication *ev_application) g_free (dir); } #else - ev_application->data_dir = g_strdup (DATADIR); + ev_application->data_dir = g_strdup (EVINCEDATADIR); #endif ev_application_init_session (ev_application); - home_dir = g_get_home_dir (); - if (home_dir) { - ev_application->accel_map_file = g_build_filename (home_dir, - ".gnome2", - "accels", - "evince", - NULL); - gtk_accel_map_load (ev_application->accel_map_file); - } - - ev_application->toolbars_model = egg_toolbars_model_new (); + ev_application_accel_map_load (ev_application); - ev_application->toolbars_file = g_build_filename - (ev_application->dot_dir, "evince_toolbar.xml", NULL); +#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); + } - toolbar_path = g_build_filename (ev_application->data_dir, - "evince-toolbar.xml", NULL); - egg_toolbars_model_load_names (ev_application->toolbars_model, - toolbar_path); + 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, - toolbar_path); - } - g_free (toolbar_path); + 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 +} - egg_toolbars_model_set_flags (ev_application->toolbars_model, 0, - EGG_TB_MODEL_NOT_REMOVABLE); +gboolean +ev_application_has_window (EvApplication *application) +{ + GList *l, *toplevels; + gboolean retval = FALSE; -#ifdef ENABLE_DBUS - ev_application->connection = dbus_g_bus_get (DBUS_BUS_STARTER, &error); - if (ev_application->connection) { - dbus_g_connection_register_g_object (ev_application->connection, - APPLICATION_DBUS_OBJECT_PATH, - G_OBJECT (ev_application)); - ev_application->windows = g_hash_table_new_full (g_direct_hash, - g_direct_equal, - NULL, - (GDestroyNotify)g_free); - ev_application->scr_saver = totem_scrsaver_new (ev_application->connection); - } else { - g_warning ("Error connection to DBus: %s\n", error->message); - g_error_free (error); + toplevels = gtk_window_list_toplevels (); + + for (l = toplevels; l != NULL && !retval; l = l->next) { + if (EV_IS_WINDOW (l->data)) + retval = TRUE; } - ev_application->keys = ev_media_player_keys_new (); -#endif /* ENABLE_DBUS */ + + 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; +} + +const gchar * +ev_application_get_uri (EvApplication *application) +{ + return application->uri; } /** @@ -1013,19 +1193,6 @@ ev_application_get_media_keys (EvApplication *application) #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_filechooser_uri (EvApplication *application, GtkFileChooserAction action, @@ -1058,160 +1225,22 @@ ev_application_get_filechooser_uri (EvApplication *application, void ev_application_screensaver_enable (EvApplication *application) { - if (application->scr_saver) - totem_scrsaver_enable (application->scr_saver); + totem_scrsaver_enable (application->scr_saver); } void ev_application_screensaver_disable (EvApplication *application) { - if (application->scr_saver) - totem_scrsaver_disable (application->scr_saver); -} - -static GKeyFile * -ev_application_get_print_settings_file (EvApplication *application) -{ - gchar *filename; - - if (application->print_settings_file) - return application->print_settings_file; - - application->print_settings_file = g_key_file_new (); - - filename = g_build_filename (ev_application_get_dot_dir (application), EV_PRINT_SETTINGS_FILE, NULL); - if (g_file_test (filename, G_FILE_TEST_IS_REGULAR)) { - GError *error = NULL; - - g_key_file_load_from_file (application->print_settings_file, - filename, - G_KEY_FILE_KEEP_COMMENTS | - G_KEY_FILE_KEEP_TRANSLATIONS, - &error); - if (error) { - g_warning ("%s", error->message); - g_error_free (error); - } - } - g_free (filename); - - return application->print_settings_file; -} - -static void -ev_application_save_print_settings (EvApplication *application) -{ - GKeyFile *key_file; - gchar *filename; - gchar *data; - gssize data_length; - GError *error = NULL; - - if (!application->print_settings && !application->page_setup) - return; - - key_file = ev_application_get_print_settings_file (application); - if (application->print_settings) - gtk_print_settings_to_key_file (application->print_settings, - key_file, - EV_PRINT_SETTINGS_GROUP); - if (application->page_setup) - gtk_page_setup_to_key_file (application->page_setup, - key_file, - EV_PAGE_SETUP_GROUP); - - filename = g_build_filename (ev_application_get_dot_dir (application), EV_PRINT_SETTINGS_FILE, NULL); - data = g_key_file_to_data (key_file, (gsize *)&data_length, NULL); - g_file_set_contents (filename, data, data_length, &error); - if (error) { - g_warning ("%s", error->message); - g_error_free (error); - } - g_free (data); - g_free (filename); -} - -GtkPrintSettings * -ev_application_get_print_settings (EvApplication *application) -{ - GKeyFile *key_file; - GtkPrintSettings *print_settings; - - if (application->print_settings) - return application->print_settings; - - key_file = ev_application_get_print_settings_file (application); - print_settings = g_key_file_has_group (key_file, EV_PRINT_SETTINGS_GROUP) ? - gtk_print_settings_new_from_key_file (key_file, EV_PRINT_SETTINGS_GROUP, NULL) : - gtk_print_settings_new (); - - application->print_settings = print_settings ? print_settings : gtk_print_settings_new (); - - return application->print_settings; -} - -void -ev_application_set_print_settings (EvApplication *application, - GtkPrintSettings *settings) -{ - GKeyFile *key_file; - - g_return_if_fail (GTK_IS_PRINT_SETTINGS (settings)); - - if (settings == application->print_settings) - return; - - key_file = ev_application_get_print_settings_file (application); - - if (application->print_settings) - g_object_unref (application->print_settings); - - application->print_settings = g_object_ref (settings); - gtk_print_settings_to_key_file (settings, key_file, EV_PRINT_SETTINGS_GROUP); -} - -GtkPageSetup * -ev_application_get_page_setup (EvApplication *application) -{ - GKeyFile *key_file; - GtkPageSetup *page_setup; - - if (application->page_setup) - return application->page_setup; - - key_file = ev_application_get_print_settings_file (application); - page_setup = g_key_file_has_group (key_file, EV_PAGE_SETUP_GROUP) ? - gtk_page_setup_new_from_key_file (key_file, EV_PAGE_SETUP_GROUP, NULL) : - gtk_page_setup_new (); - - application->page_setup = page_setup ? page_setup : gtk_page_setup_new (); - - return application->page_setup; -} - -void -ev_application_set_page_setup (EvApplication *application, - GtkPageSetup *page_setup) -{ - GKeyFile *key_file; - - g_return_if_fail (GTK_IS_PAGE_SETUP (page_setup)); - - if (page_setup == application->page_setup) - return; - - key_file = ev_application_get_print_settings_file (application); - - if (application->page_setup) - g_object_unref (application->page_setup); - - application->page_setup = g_object_ref (page_setup); - gtk_page_setup_to_key_file (page_setup, key_file, EV_PAGE_SETUP_GROUP); + totem_scrsaver_disable (application->scr_saver); } const gchar * -ev_application_get_dot_dir (EvApplication *application) +ev_application_get_dot_dir (EvApplication *application, + gboolean create) { + if (create) + g_mkdir_with_parents (application->dot_dir, 0700); + return application->dot_dir; }