evince r2929 - in trunk: . shell

[alexl svn gnome org]

Author: alexl
Date: Mon Feb 25 13:18:20 2008
New Revision: 2929
URL: http://svn.gnome.org/viewvc/evince?rev=2929&view=rev

Log:
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.



Modified:
   trunk/ChangeLog
   trunk/configure.ac
   trunk/shell/ev-window.c

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Mon Feb 25 13:18:20 2008
@@ -47,7 +47,7 @@
 
 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

Modified: trunk/shell/ev-window.c
==============================================================================
--- trunk/shell/ev-window.c	(original)
+++ trunk/shell/ev-window.c	Mon Feb 25 13:18:20 2008
@@ -1277,7 +1277,7 @@
 	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);
 	}