From 1aa84014113a4c139d31e4da47616cd097fc7348 Mon Sep 17 00:00:00 2001 From: Alexander Larsson Date: Mon, 25 Feb 2008 13:18:20 +0000 Subject: [PATCH] Use g_file_has_prefix instead of renamed g_file_contains_file. 2008-02-25 Alexander Larsson * shell/ev-window.c (ev_window_clear_temp_file): Use g_file_has_prefix instead of renamed g_file_contains_file. * configure.ac: Require new glib for above change. svn path=/trunk/; revision=2929 --- ChangeLog | 9 +++++++++ configure.ac | 2 +- shell/ev-window.c | 2 +- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index a0fa0fc5..b1de678d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2008-02-25 Alexander Larsson + + * shell/ev-window.c (ev_window_clear_temp_file): + Use g_file_has_prefix instead of renamed + g_file_contains_file. + + * configure.ac: + Require new glib for above change. + 2008-02-16 Carlos Garcia Campos * libdocument/ev-image.c: (ev_image_finalize), diff --git a/configure.ac b/configure.ac index 132c636b..63d5fa1e 100644 --- a/configure.ac +++ b/configure.ac @@ -47,7 +47,7 @@ dnl Check dependencies DBUS_GLIB_REQUIRED=0.70 GTK_REQUIRED=2.10.0 -GLIB_REQUIRED=2.15.4 +GLIB_REQUIRED=2.15.6 KEYRING_REQUIRED=0.4.0 LIBGNOMEUI_REQUIRED=2.14.0 diff --git a/shell/ev-window.c b/shell/ev-window.c index dc8ac94f..4c3fcf23 100644 --- a/shell/ev-window.c +++ b/shell/ev-window.c @@ -1277,7 +1277,7 @@ ev_window_clear_temp_file (EvWindow *ev_window) file = g_file_new_for_uri (ev_window->priv->uri); tempdir = g_file_new_for_path (g_get_tmp_dir ()); - if (g_file_contains_file (tempdir, file)) { + if (g_file_has_prefix (file, tempdir)) { g_file_delete (file, NULL, NULL); } -- 2.43.5