From 11368f9b50db86ce4f2ae0b549fb575a19af2a74 Mon Sep 17 00:00:00 2001
From: Marco Pesenti Gritti <mpg@redhat.com>
Date: Tue, 10 May 2005 12:48:34 +0000
Subject: Put the toolbar xml in evince own dot dir

2005-05-10  Marco Pesenti Gritti  <mpg@redhat.com>

        * lib/Makefile.am:
        * shell/ev-window.c: (ev_window_cmd_edit_toolbar_cb),
        (ev_window_init):
        * shell/main.c: (main):

        Put the toolbar xml in evince own dot dir
---
(limited to 'shell/ev-window.c')

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,
--
cgit v0.9.1