[totem-screensaver] Adapt to GDBus API change

[evince.git] / libdocument / ev-file-helpers.c

diff --git a/libdocument/ev-file-helpers.c b/libdocument/ev-file-helpers.c
index 09890d76200c538a45b92e3e20180b3edc8ac624..edd4e4fd0adc2414e6918cab61dc7bceb4ce75e8 100644 (file)
--- a/libdocument/ev-file-helpers.c
+++ b/libdocument/ev-file-helpers.c
@@ -319,13 +319,13 @@ ev_mkdtemp (const char        *template,
 void
 ev_tmp_filename_unlink (const gchar *filename)
 {
-       const gchar *tempdir;
-       
        if (!filename)
                return;
 
-       tempdir = g_get_tmp_dir ();
-       if (g_str_has_prefix (filename, tempdir) == 0) {
+       if (!tmp_dir)
+               return;
+
+       if (g_str_has_prefix (filename, tmp_dir)) {
                g_unlink (filename);
        }
 }
@@ -369,6 +369,25 @@ ev_tmp_uri_unlink (const gchar *uri)
        g_object_unref (file);
 }
 
+gboolean
+ev_file_is_temp (GFile *file)
+{
+       gchar   *path;
+       gboolean retval;
+
+       if (!g_file_is_native (file))
+               return FALSE;
+
+       path = g_file_get_path (file);
+       if (!path)
+               return FALSE;
+
+       retval = g_str_has_prefix (path, g_get_tmp_dir ());
+       g_free (path);
+
+       return retval;
+}
+
 /**
  * ev_xfer_uri_simple:
  * @from: the source URI
@@ -397,9 +416,7 @@ ev_xfer_uri_simple (const char *from,
        target_file = g_file_new_for_uri (to);
        
        result = g_file_copy (source_file, target_file,
-#if GLIB_CHECK_VERSION(2,19,0)
                              G_FILE_COPY_TARGET_DEFAULT_PERMS |
-#endif
                              G_FILE_COPY_OVERWRITE,
                              NULL, NULL, NULL, error);