diff options
Diffstat (limited to 'shell')
| -rw-r--r-- | shell/ev-window.c | 14 | ||||
| -rw-r--r-- | shell/main.c | 3 |
2 files changed, 11 insertions, 6 deletions
diff --git a/shell/ev-window.c b/shell/ev-window.c index 6a6e00d..2db012d 100644 --- a/shell/ev-window.c +++ b/shell/ev-window.c @@ -52,6 +52,9 @@ #include "egg-editable-toolbar.h" #include "ephy-zoom.h" #include "ephy-zoom-action.h" +#include "ev-application.h" +#include "ev-stock-icons.h" +#include "ev-file-helpers.h" #include <glib/gi18n.h> #include <gtk/gtk.h> @@ -66,9 +69,6 @@ #include <string.h> -#include "ev-application.h" -#include "ev-stock-icons.h" - typedef enum { PAGE_MODE_SINGLE_PAGE, PAGE_MODE_CONTINUOUS_PAGE, @@ -1666,8 +1666,10 @@ static void ev_window_cmd_edit_toolbar_cb (GtkDialog *dialog, gint response, gpointer data) { EvWindow *ev_window = EV_WINDOW (data); - egg_editable_toolbar_set_edit_mode (EGG_EDITABLE_TOOLBAR (ev_window->priv->toolbar), FALSE); - egg_toolbars_model_save (ev_window->priv->toolbar_model, ev_window->priv->toolbar_file, "1.0"); + egg_editable_toolbar_set_edit_mode + (EGG_EDITABLE_TOOLBAR (ev_window->priv->toolbar), FALSE); + egg_toolbars_model_save (ev_window->priv->toolbar_model, + ev_window->priv->toolbar_file, "1.0"); gtk_widget_destroy (GTK_WIDGET (dialog)); } @@ -2714,7 +2716,7 @@ ev_window_init (EvWindow *ev_window) ev_window->priv->toolbar_model = egg_toolbars_model_new (); ev_window->priv->toolbar_file = g_build_filename - (g_get_home_dir (), ".gnome2/evince_toolbar.xml", NULL); + (ev_dot_dir (), "evince_toolbar.xml", NULL); if (!g_file_test (ev_window->priv->toolbar_file, G_FILE_TEST_EXISTS)) { egg_toolbars_model_load (ev_window->priv->toolbar_model, diff --git a/shell/main.c b/shell/main.c index 321334b..b0a0b76 100644 --- a/shell/main.c +++ b/shell/main.c @@ -32,6 +32,7 @@ #include "ev-stock-icons.h" #include "ev-debug.h" #include "ev-job-queue.h" +#include "ev-file-helpers.h" static struct poptOption popt_options[] = { @@ -87,6 +88,7 @@ main (int argc, char *argv[]) ev_job_queue_init (); g_set_application_name (_("Evince Document Viewer")); + ev_file_helpers_init (); ev_debug_init (); ev_stock_icons_init (); gtk_window_set_default_icon_name ("postscript-viewer"); @@ -102,6 +104,7 @@ main (int argc, char *argv[]) gnome_accelerators_sync (); poptFreeContext (context); + ev_file_helpers_shutdown (); return 0; } |