Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
path: root/backend
diff options
context:
space:
mode:
authorCarlos Garcia Campos <carlosgc@gnome.org>2006-11-15 11:33:09 (GMT)
committer Carlos Garcia Campos <carlosgc@src.gnome.org>2006-11-15 11:33:09 (GMT)
commit67654fe8c933af2932e2c87ec2a4560cb064c545 (patch)
treea272dcff310f3b4f7b9b34652d42db7cda755f67 /backend
parent1dd619d11cc65d17b3fd08b650668fb3f85e35e9 (diff)
Use always ev_tmp_dir instead of g_get_tmp_dir. Fix a race condition in
2006-11-15 Carlos Garcia Campos <carlosgc@gnome.org> * backend/Makefile.am: * backend/ev-attachment.c: (ev_attachment_open): * lib/ev-file-helpers.[ch]: (ensure_dir_exists), (ev_dot_dir), (ev_tmp_dir), (ev_tmp_filename): * shell/ev-sidebar-attachments.c: (ev_sidebar_attachments_drag_data_get): * shell/ev-window.c: (ev_window_clear_temp_file): Use always ev_tmp_dir instead of g_get_tmp_dir. Fix a race condition in ensure_dir_exists. Abort without crashing when we can't create user's directory.
Diffstat (limited to 'backend')
-rw-r--r--backend/Makefile.am1
-rw-r--r--backend/ev-attachment.c3
2 files changed, 3 insertions, 1 deletions
diff --git a/backend/Makefile.am b/backend/Makefile.am
index f92c607..f7ae5ec 100644
--- a/backend/Makefile.am
+++ b/backend/Makefile.am
@@ -1,6 +1,7 @@
INCLUDES= \
-DEVINCE_UIDIR=\"$(pkgdatadir)\" \
-DGNOMELOCALEDIR=\"$(datadir)/locale\" \
+ -I$(top_srcdir)/lib \
-I$(top_srcdir)/pdf \
-I$(top_srcdir)/pixbuf \
-I$(top_srcdir)/tiff \
diff --git a/backend/ev-attachment.c b/backend/ev-attachment.c
index 63619af..7e7ca12 100644
--- a/backend/ev-attachment.c
+++ b/backend/ev-attachment.c
@@ -22,6 +22,7 @@
#include <libgnomevfs/gnome-vfs.h>
#include <libgnomevfs/gnome-vfs-mime-handlers.h>
#include <libgnomevfs/gnome-vfs-mime-utils.h>
+#include "ev-file-helpers.h"
#include "ev-attachment.h"
enum
@@ -389,7 +390,7 @@ ev_attachment_open (EvAttachment *attachment,
} else {
gchar *uri, *filename;
- filename = g_build_filename (g_get_tmp_dir (), attachment->priv->name, NULL);
+ filename = g_build_filename (ev_tmp_dir (), attachment->priv->name, NULL);
uri = g_filename_to_uri (filename, NULL, NULL);
if (ev_attachment_save (attachment, uri, error)) {