X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;f=shell%2Fev-application.c;h=9fe6596acc64eae059e3c5482b8662940a0f46e7;hb=7ffaa3a0083d1f59a721f9f22f23d29d3cfc52aa;hp=69a5a730e78b79a6044eb3427a7785dcbd21df35;hpb=66e5636dcaace0d9a98845490b09721c12ce3d2b;p=evince.git diff --git a/shell/ev-application.c b/shell/ev-application.c index 69a5a730..9fe6596a 100644 --- a/shell/ev-application.c +++ b/shell/ev-application.c @@ -20,17 +20,19 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA. */ -#include +#include #include #include #include #include +#include #include #ifdef GDK_WINDOWING_X11 #include #endif +#include #include "totem-scrsaver.h" @@ -39,9 +41,7 @@ #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 @@ -58,24 +58,19 @@ static gboolean ev_application_open_uri (EvApplication *application, #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; + EvMediaPlayerKeys *keys; #endif - EggToolbarsModel *toolbars_model; - TotemScrsaver *scr_saver; #ifdef WITH_SMCLIENT @@ -84,14 +79,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 { @@ -107,10 +94,6 @@ G_DEFINE_TYPE (EvApplication, ev_application, G_TYPE_OBJECT); #define APPLICATION_DBUS_INTERFACE "org.gnome.evince.Application" #endif -#define EV_PRINT_SETTINGS_FILE "print-settings" -#define EV_PRINT_SETTINGS_GROUP "Print Settings" -#define EV_PAGE_SETUP_GROUP "Page Setup" - /** * ev_application_get_instance: * @@ -128,43 +111,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 +127,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 +148,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 +160,6 @@ smclient_quit_cb (EggSMClient *client, { ev_application_shutdown (application); } - #endif /* WITH_SMCLIENT */ static void @@ -443,56 +383,116 @@ build_args (GdkScreen *screen, return args; } -/** - * 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 void +child_setup (gpointer user_data) { - GtkWidget *new_window = ev_window_new (); + gchar *startup_id; - if (screen) { - ev_stock_icons_set_screen (screen); - gtk_window_set_screen (GTK_WINDOW (new_window), screen); - } + 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); +} - if (!GTK_WIDGET_REALIZED (new_window)) - gtk_widget_realize (new_window); +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 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); +#ifdef G_OS_WIN32 +{ + gchar *dir; - gtk_window_present (GTK_WINDOW (new_window)); + dir = g_win32_get_package_installation_directory_of_module (NULL); + argv[arg++] = g_build_filename (dir, "bin", "evince", NULL); + g_free (dir); +} #else - gtk_window_present_with_time (GTK_WINDOW (new_window), timestamp); -#endif /* GDK_WINDOWING_X11 */ + 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)); + } + + /* 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]); + } +} + +static GList * +ev_application_get_windows (EvApplication *application) +{ + GList *l, *toplevels; + GList *windows = NULL; + + 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); + } + } + + 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); @@ -505,47 +505,10 @@ 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; - } - } - } - - g_list_free (windows); - - return uri_window; -} #ifdef ENABLE_DBUS static gboolean @@ -635,16 +598,6 @@ ev_application_unregister_uri (EvApplication *application, g_object_unref (proxy); } - -static void -ev_application_window_destroyed (EvApplication *application, - EvWindow *ev_window) -{ - gchar *uri = g_hash_table_lookup (application->windows, ev_window); - - ev_application_unregister_uri (application, uri); - g_hash_table_remove (application->windows, ev_window); -} #endif /* ENABLE_DBUS */ static void @@ -666,15 +619,6 @@ 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 (!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))) gtk_widget_realize (GTK_WIDGET (ev_window)); @@ -715,9 +659,12 @@ ev_application_open_uri_at_dest (EvApplication *application, g_return_if_fail (uri != NULL); - ev_window = ev_application_get_uri_window (application, uri); + 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 - if (!ev_window) { GHashTable *args = build_args (screen, dest, mode, search_string); gboolean ret; @@ -728,22 +675,54 @@ ev_application_open_uri_at_dest (EvApplication *application, 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) + ev_window = EV_WINDOW (ev_window_new ()); } - if (ev_window == NULL) { - ev_window = EV_WINDOW (ev_window_new ()); - } + application->uri = g_strdup (uri); ev_application_open_uri_in_window (application, uri, ev_window, - screen, dest, mode, search_string, + 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); + } + + if (!GTK_WIDGET_REALIZED (new_window)) + gtk_widget_realize (new_window); + +#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 (GTK_WINDOW (new_window)); +#else + gtk_window_present_with_time (GTK_WINDOW (new_window), timestamp); +#endif /* GDK_WINDOWING_X11 */ +} + /** * ev_application_open_uri: * @application: The instance of the application. @@ -759,14 +738,23 @@ ev_application_open_uri (EvApplication *application, guint timestamp, GError **error) { - EvWindow *ev_window; + GList *windows, *l; 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); + 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); @@ -775,9 +763,16 @@ ev_application_open_uri (EvApplication *application, search_string = get_find_string_from_args (args); } - 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); + + 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); @@ -800,46 +795,64 @@ 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 (g_get_home_dir (), + ".gnome2", "accels", + "evince", NULL); - ev_application_save_print_settings (application); - - if (application->print_settings_file) { - g_key_file_free (application->print_settings_file); - application->print_settings_file = 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 (application->print_settings) { - g_object_unref (application->print_settings); - application->print_settings = NULL; + 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 (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->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); + #ifdef ENABLE_DBUS if (application->keys) { g_object_unref (application->keys); @@ -874,9 +887,6 @@ ev_application_class_init (EvApplicationClass *ev_application_class) 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 (), @@ -884,10 +894,6 @@ ev_application_init (EvApplication *ev_application) "evince", NULL); - /* FIXME: why make this fatal? */ - if (!ev_dir_ensure_exists (ev_application->dot_dir, 0700)) - exit (1); - #ifdef G_OS_WIN32 { gchar *dir; @@ -902,51 +908,7 @@ ev_application_init (EvApplication *ev_application) ev_application_init_session (ev_application); - home_dir = g_get_home_dir (); - if (home_dir) { - ev_application->accel_map_file = g_build_filename (home_dir, - ".gnome2", - "accels", - "evince", - NULL); - gtk_accel_map_load (ev_application->accel_map_file); - } - - ev_application->toolbars_model = egg_toolbars_model_new (); - - ev_application->toolbars_file = g_build_filename - (ev_application->dot_dir, "evince_toolbar.xml", NULL); - - toolbar_path = g_build_filename (ev_application->data_dir, - "evince-toolbar.xml", NULL); - egg_toolbars_model_load_names (ev_application->toolbars_model, - toolbar_path); - - if (!egg_toolbars_model_load_toolbars (ev_application->toolbars_model, - ev_application->toolbars_file)) { - egg_toolbars_model_load_toolbars (ev_application->toolbars_model, - toolbar_path); - } - g_free (toolbar_path); - - /* Open item doesn't exist anymore, - * convert it to OpenRecent for compatibility - */ - for (i = 0; i < egg_toolbars_model_n_items (ev_application->toolbars_model, 0); i++) { - const gchar *item; - - item = egg_toolbars_model_item_nth (ev_application->toolbars_model, 0, i); - if (g_ascii_strcasecmp (item, "FileOpen") == 0) { - egg_toolbars_model_remove_item (ev_application->toolbars_model, 0, i); - egg_toolbars_model_add_item (ev_application->toolbars_model, 0, i, - "FileOpenRecent"); - ev_application_save_toolbars_model (ev_application); - break; - } - } - - egg_toolbars_model_set_flags (ev_application->toolbars_model, 0, - EGG_TB_MODEL_NOT_REMOVABLE); + ev_application_accel_map_load (ev_application); #ifdef ENABLE_DBUS ev_application->connection = dbus_g_bus_get (DBUS_BUS_STARTER, &error); @@ -954,10 +916,6 @@ ev_application_init (EvApplication *ev_application) 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); @@ -967,31 +925,21 @@ ev_application_init (EvApplication *ev_application) #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; } /** @@ -1012,19 +960,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, @@ -1068,149 +1003,13 @@ ev_application_screensaver_disable (EvApplication *application) 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); -} - 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; }