diff options
author | Christian Persch <chpe@src.gnome.org> | 2009-01-26 18:29:31 (GMT) |
---|---|---|
committer | Christian Persch <chpe@src.gnome.org> | 2009-01-26 18:29:31 (GMT) |
commit | 84c2106c83ce1eb1b0012e9714ef15875e202e72 (patch) | |
tree | bb20dd741519c3b73b860219d14a6b69a28ab8c6 /shell/ev-metadata-manager.c | |
parent | d8e0f342c454da540242925c83a218d6c24be3dd (diff) |
Move ev_dot_dir() from libdocument to shell, since it shouldn't be public
* libdocument/ev-file-helpers.c: (ev_dir_ensure_exists),
(ev_tmp_dir), (ev_file_helpers_init), (ev_file_helpers_shutdown):
* libdocument/ev-file-helpers.h:
* shell/ev-application.c: (ev_application_shutdown),
(ev_application_init), (ev_application_screensaver_disable),
(ev_application_save_print_settings),
(ev_application_set_page_setup):
* shell/ev-application.h:
* shell/ev-metadata-manager.c: (load_values),
(ev_metadata_manager_save): Move ev_dot_dir() from libdocument to
shell, since it shouldn't be public API. Bug #569120.
* libdocument/ev-file-helpers.c: (ev_tmp_filename): Use
g_get_prgname() instead of hardcoding "evince" for the tmpdir name.
svn path=/trunk/; revision=3383
Diffstat (limited to 'shell/ev-metadata-manager.c')
-rw-r--r-- | shell/ev-metadata-manager.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/shell/ev-metadata-manager.c b/shell/ev-metadata-manager.c index ce164ad..c5235fa 100644 --- a/shell/ev-metadata-manager.c +++ b/shell/ev-metadata-manager.c @@ -37,6 +37,7 @@ #include <libxml/xmlreader.h> #include "ev-metadata-manager.h" +#include "ev-application.h" #include "ev-file-helpers.h" #define METADATA_FILE "ev-metadata.xml" @@ -271,7 +272,7 @@ load_values () xmlKeepBlanksDefault (0); /* FIXME: file locking - Paolo */ - file_name = g_build_filename (ev_dot_dir (), METADATA_FILE, NULL); + file_name = g_build_filename (ev_application_get_dot_dir (EV_APP), METADATA_FILE, NULL); if (!g_file_test (file_name, G_FILE_TEST_EXISTS)) { g_free (file_name); @@ -670,7 +671,7 @@ ev_metadata_manager_save (gpointer data) (GHFunc)save_item, root); /* FIXME: lock file - Paolo */ - file_name = g_build_filename (ev_dot_dir (), METADATA_FILE, NULL); + file_name = g_build_filename (ev_application_get_dot_dir (EV_APP), METADATA_FILE, NULL); xmlSaveFormatFile (file_name, doc, 1); g_free (file_name); |