Use g_file_has_prefix instead of renamed g_file_contains_file.

2008-02-25  Alexander Larsson  <alexl@redhat.com>

	* 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

diff --git a/ChangeLog b/ChangeLog
index a0fa0fc552f374f984a95c40ce502356fd98b986..b1de678df1fef565294784479614d73f67845bde 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2008-02-25  Alexander Larsson  <alexl@redhat.com>
+
+       * 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  <carlosgc@gnome.org>
 
        * libdocument/ev-image.c: (ev_image_finalize),

diff --git a/configure.ac b/configure.ac
index 132c636ba895323ab0c969c72cb364601d125b84..63d5fa1eef1a85c83b378e75e6166a9a06d45cee 100644 (file)
--- 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 dc8ac94f2c7fcf0311bc22759d2ad6774e17b774..4c3fcf2397ab7ce4eb64ceb77e5b7b4f72bec9d9 100644 (file)
--- 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);
        }