From 4ba7db7a91de431134c23bd2b43ca4e5e63e2bac Mon Sep 17 00:00:00 2001

From: Debarshi Ray <debarshir@gnome.org>

Date: Wed, 29 Mar 2017 16:04:08 +0200

Subject: [PATCH 01/16] documents: Simplify calculation of thumbnail paths for

 GoogleDocuments

https://bugzilla.gnome.org/show_bug.cgi?id=780718

---

 src/documents.js | 9 ++++-----

 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/documents.js b/src/documents.js

index 50cfbdafc7ee..2071882218b2 100644

--- a/src/documents.js

+++ b/src/documents.js

@@ -30,6 +30,7 @@ const GdPrivate = imports.gi.GdPrivate;

 const Gdk = imports.gi.Gdk;

 const GData = imports.gi.GData;

 const GLib = imports.gi.GLib;

+const GnomeDesktop = imports.gi.GnomeDesktop;

 const Gtk = imports.gi.Gtk;

 const Zpj = imports.gi.Zpj;

 const _ = imports.gettext.gettext;

@@ -916,12 +917,10 @@ const GoogleDocument = new Lang.Class({

                                                              authorization_domain: authorizationDomain,

                                                              download_uri: uri });

-                let checksum = new GLib.Checksum(GLib.ChecksumType.MD5);

-                checksum.update(this.uri, -1);

-                let dirPath = GLib.build_filenamev([GLib.get_user_cache_dir(), "thumbnails", "normal"]);

+                let path = GnomeDesktop.desktop_thumbnail_path_for_uri (this.uri,

+                                                                        GnomeDesktop.DesktopThumbnailSize.NORMAL);

+                let dirPath = GLib.path_get_dirname(path);

                 GLib.mkdir_with_parents(dirPath, 448);

-                let basename = checksum.get_string() + '.png';

-                let path = GLib.build_filenamev([dirPath, basename])

                 let downloadFile = Gio.File.new_for_path(path);

                 downloadFile.replace_async

-- 

2.9.4

From 7597a3e77b5c0192fc848f5fc7f65bb5b662ed20 Mon Sep 17 00:00:00 2001

From: Debarshi Ray <debarshir@gnome.org>

Date: Thu, 30 Mar 2017 16:54:15 +0200

Subject: [PATCH 02/16] documents: Track nfo:fileName for later use

Now that we can open ODFs and OOXMLs in LOKDocView, we don't need to

convert all remote documents to PDF. For example, we can open office

documents stored from OneDrive without any format conversion. The

nfo:fileName can be used to determine the extension of the cached file.

https://bugzilla.gnome.org/show_bug.cgi?id=774937

---

 src/documents.js | 7 ++++---

 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/documents.js b/src/documents.js

index 2071882218b2..6ecc255c9407 100644

--- a/src/documents.js

+++ b/src/documents.js

@@ -229,6 +229,7 @@ const DocCommon = new Lang.Class({

     _init: function(cursor) {

         this.id = null;

         this.uri = null;

+        this.filename = null;

         this.name = null;

         this.author = null;

         this.mtime = null;

@@ -306,12 +307,12 @@ const DocCommon = new Lang.Class({

             this.uri = '';

         let title = cursor.get_string(Query.QueryColumns.TITLE)[0];

-        let filename = cursor.get_string(Query.QueryColumns.FILENAME)[0];

+        this.filename = cursor.get_string(Query.QueryColumns.FILENAME)[0];

         if (title && title != '')

             this.name = title;

-        else if (filename)

-            this.name = GdPrivate.filename_strip_extension(filename);

+        else if (this.filename)

+            this.name = GdPrivate.filename_strip_extension(this.filename);

         else

             this.name = '';

-- 

2.9.4

From 291a12b177411b960c91413a51f05493daf98bd1 Mon Sep 17 00:00:00 2001

From: Debarshi Ray <debarshir@gnome.org>

Date: Thu, 30 Mar 2017 17:25:44 +0200

Subject: [PATCH 03/16] documents: Add property to denote the URI to be loaded

 by the preview

We want to open ODFs and OOXMLs from OneDrive using LOKDocView, not

EvView. Therefore, the logic to convert a remote document into

something that can be loaded by the different preview widgets can no

longer be hidden inside GdPdfLoader. LOKDocView needs to know the URI

it can load without hitting the network.

For local and ownCloud this is the same as the actual URI because they

are natively handled by GIO. The property is not defined for Google

because it is still handled entirely by GdPdfLoader.

This changes the caching for SkydriveDocuments. The old scheme was:

  ~/.cache/gnome-documents/gnome-documents-<g_str_hash(id)>.pdf

The new structure is:

  ~/.cache/gnome-documents/skydrive/<SHA1(id)>.<original-extension>

The new scheme namespaces each document type and uses a hash function

that can be easily replicated by other tools for debugging. This is a

good time to change this because we are about to invalidate existing

caches by not using the ".pdf" extension for all SkydriveDocuments.

https://bugzilla.gnome.org/show_bug.cgi?id=774937

---

 src/documents.js | 24 +++++++++++++++++++++++-

 src/epubview.js  |  2 +-

 src/lokview.js   |  2 +-

 3 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/src/documents.js b/src/documents.js

index 6ecc255c9407..c50d50078f2f 100644

--- a/src/documents.js

+++ b/src/documents.js

@@ -229,6 +229,7 @@ const DocCommon = new Lang.Class({

     _init: function(cursor) {

         this.id = null;

         this.uri = null;

+        this.uriToLoad = null;

         this.filename = null;

         this.name = null;

         this.author = null;

@@ -618,7 +619,7 @@ const DocCommon = new Lang.Class({

             return;

         }

-        GdPrivate.pdf_loader_load_uri_async(this.uri, passwd, cancellable, Lang.bind(this,

+        GdPrivate.pdf_loader_load_uri_async(this.uriToLoad, passwd, cancellable, Lang.bind(this,

             function(source, res) {

                 try {

                     let docModel = GdPrivate.pdf_loader_load_uri_finish(res);

@@ -749,6 +750,7 @@ const LocalDocument = new Lang.Class({

     populateFromCursor: function(cursor) {

         this.parent(cursor);

+        this.uriToLoad = this.uri;

         if (!Application.application.gettingStartedLocation)

             return;

@@ -1013,6 +1015,11 @@ const OwncloudDocument = new Lang.Class({

             this.defaultAppName = this.defaultApp.get_name();

     },

+    populateFromCursor: function(cursor) {

+        this.parent(cursor);

+        this.uriToLoad = this.uri;

+    },

+

     createThumbnail: function(callback) {

         GdPrivate.queue_thumbnail_job_for_file_async(this._file, Lang.bind(this,

             function(object, res) {

@@ -1071,6 +1078,21 @@ const SkydriveDocument = new Lang.Class({

         this.sourceName = _("OneDrive");

     },

+    populateFromCursor: function(cursor) {

+        this.parent(cursor);

+

+        let localDir = GLib.build_filenamev([GLib.get_user_cache_dir(), "gnome-documents", "skydrive"]);

+

+        let identifierHash = GLib.compute_checksum_for_string(GLib.ChecksumType.SHA1, this.identifier, -1);

+        let filenameStripped = GdPrivate.filename_strip_extension(this.filename);

+        let extension = this.filename.substring(filenameStripped.length);

+        let localFilename = identifierHash + extension;

+

+        let localPath = GLib.build_filenamev([localDir, localFilename]);

+        let localFile = Gio.File.new_for_path(localPath);

+        this.uriToLoad = localFile.get_uri();

+    },

+

     _createZpjEntry: function(cancellable, callback) {

         let source = Application.sourceManager.getItemById(this.resourceUrn);

diff --git a/src/epubview.js b/src/epubview.js

index 923b0aa265ab..12f392225d6f 100644

--- a/src/epubview.js

+++ b/src/epubview.js

@@ -65,7 +65,7 @@ const EPUBView = new Lang.Class({

     onLoadFinished: function(manager, doc) {

         this.parent(manager, doc);

-        let f = Gio.File.new_for_uri(doc.uri);

+        let f = Gio.File.new_for_uri(doc.uriToLoad);

         this._epubdoc = new Gepub.Doc({ path: f.get_path() });

         this._epubdoc.init(null);

diff --git a/src/lokview.js b/src/lokview.js

index 092adc5a0471..988db963d5d9 100644

--- a/src/lokview.js

+++ b/src/lokview.js

@@ -148,7 +148,7 @@ const LOKView = new Lang.Class({

         if (!isAvailable())

             return;

         this._doc = doc;

-        this._lokview.open_document(doc.uri, '{}', null, Lang.bind(this, this._onDocumentOpened));

+        this._lokview.open_document(doc.uriToLoad, '{}', null, Lang.bind(this, this._onDocumentOpened));

         this._progressBar.show();

     },

-- 

2.9.4

From 0ea69b0519a4e374feabc1923c82e1e0c71d5914 Mon Sep 17 00:00:00 2001

From: Debarshi Ray <debarshir@gnome.org>

Date: Thu, 30 Mar 2017 18:18:16 +0200

Subject: [PATCH 04/16] documents: Let everybody provide their own download

 implementation

This is meant to reduce our reliance on GdPdfLoader for loading remote

documents. We can open ODFs and OOXMLs in LOKDocView, so we don't need

to convert everything to PDFs. In the future, remote sub-classes will

provider their own implementation to download a document, and this will

help unify the loading across the various sub-classes.

https://bugzilla.gnome.org/show_bug.cgi?id=774937

---

 src/documents.js | 42 ++++++++++++++++++++++++++++++++++++++++++

 1 file changed, 42 insertions(+)

diff --git a/src/documents.js b/src/documents.js

index c50d50078f2f..9028e9b5084f 100644

--- a/src/documents.js

+++ b/src/documents.js

@@ -360,6 +360,48 @@ const DocCommon = new Lang.Class({

         }

     },

+    download: function(useCache, cancellable, callback) {

+        let localFile = Gio.File.new_for_uri(this.uriToLoad);

+        let localPath = localFile.get_path();

+        let localDir = GLib.path_get_dirname(localPath);

+        GLib.mkdir_with_parents(localDir, 448);

+

+        if (!useCache) {

+            this.downloadImpl(localFile, cancellable, callback);

+            return;

+        }

+

+        localFile.query_info_async(Gio.FILE_ATTRIBUTE_TIME_MODIFIED,

+                                   Gio.FileQueryInfoFlags.NONE,

+                                   GLib.PRIORITY_DEFAULT,

+                                   cancellable,

+                                   Lang.bind(this,

+            function(object, res) {

+                let info;

+

+                try {

+                    info = object.query_info_finish(res);

+                } catch (e) {

+                    this.downloadImpl(localFile, cancellable, callback);

+                    return;

+                }

+

+                let cacheMtime = info.get_attribute_uint64(Gio.FILE_ATTRIBUTE_TIME_MODIFIED);

+                cacheMtime /= 1000000;

+

+                if (this.mtime <= cacheMtime) {

+                    callback(true, null);

+                    return;

+                }

+

+                this.downloadImpl(localFile, cancellable, callback);

+            }));

+    },

+

+    downloadImpl: function(localFile, cancellable, callback) {

+        throw(new Error('DocCommon implementations must override downloadImpl'));

+    },

+

     load: function() {

         log('Error: DocCommon implementations must override load');

     },

-- 

2.9.4

From 630fc1a93bbd3a93ee242231a6a1129aef924127 Mon Sep 17 00:00:00 2001

From: Debarshi Ray <debarshir@gnome.org>

Date: Thu, 30 Mar 2017 18:23:27 +0200

Subject: [PATCH 05/16] documents: Implement the downloadImpl vfunc for

 SkydriveDocument

https://bugzilla.gnome.org/show_bug.cgi?id=774937

---

 src/documents.js | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++

 1 file changed, 56 insertions(+)

diff --git a/src/documents.js b/src/documents.js

index 9028e9b5084f..781019091754 100644

--- a/src/documents.js

+++ b/src/documents.js

@@ -1161,6 +1161,62 @@ const SkydriveDocument = new Lang.Class({

                  }));

     },

+    downloadImpl: function(localFile, cancellable, callback) {

+        this._createZpjEntry(cancellable, Lang.bind(this,

+            function(entry, service, error) {

+                if (error) {

+                    callback(false, error);

+                    return;

+                }

+

+                service.download_file_to_stream_async(entry, cancellable, Lang.bind(this,

+                    function(object, res) {

+                        let inputStream;

+

+                        try {

+                            inputStream = object.download_file_to_stream_finish(res);

+                        } catch (e) {

+                            callback(false, e);

+                            return;

+                        }

+

+                        localFile.replace_async(null,

+                                                false,

+                                                Gio.FileCreateFlags.PRIVATE,

+                                                GLib.PRIORITY_DEFAULT,

+                                                cancellable,

+                                                Lang.bind(this,

+                            function(object, res) {

+                                let outputStream;

+

+                                try {

+                                    outputStream = object.replace_finish(res);

+                                } catch (e) {

+                                    callback(false, e);

+                                    return;

+                                }

+

+                                outputStream.splice_async(inputStream,

+                                                          Gio.OutputStreamSpliceFlags.CLOSE_SOURCE |

+                                                          Gio.OutputStreamSpliceFlags.CLOSE_TARGET,

+                                                          GLib.PRIORITY_DEFAULT,

+                                                          cancellable,

+                                                          Lang.bind(this,

+                                    function(object, res) {

+                                        try {

+                                            object.splice_finish(res);

+                                        } catch (e) {

+                                            callback(false, e);

+                                            return;

+                                        }

+

+                                        callback(false, null);

+                                    }));

+                            }));

+                    }));

+            }));

+    },

+

     load: function(passwd, cancellable, callback) {

         this._createZpjEntry(cancellable, Lang.bind(this,

             function(entry, service, exception) {

-- 

2.9.4

From c21f27f63ec2cf31c254896ad8343689b9cc9499 Mon Sep 17 00:00:00 2001

From: Debarshi Ray <debarshir@gnome.org>

Date: Thu, 30 Mar 2017 18:31:18 +0200

Subject: [PATCH 06/16] documents, pdf-loader: Fix previewing of ODFs and

 OOXMLs on OneDrive

OneDrive documents were being converted to PDFs via GdPdfLoader, but

LOKDocView was being used instead of EvView to render them. LOKDocView

uses the document's URI property, and in this case it is not a valid

URI that it can use. As a result the preview would fail and sometimes

crash the application.

Solve all that by removing the PDF conversion, and passing the correct

URI to LOKDocView.

This effectively reverts 0bfb23786dc84d390c4bd6bde5f20987874e1e9b

https://bugzilla.gnome.org/show_bug.cgi?id=774937

---

 configure.ac            |   4 +-

 src/documents.js        |  50 ++++++------

 src/lib/gd-pdf-loader.c | 205 +-----------------------------------------------

 src/lib/gd-pdf-loader.h |   9 ---

 4 files changed, 29 insertions(+), 239 deletions(-)

diff --git a/configure.ac b/configure.ac

index 78cda4f799d5..8098515028d1 100644

--- a/configure.ac

+++ b/configure.ac

@@ -57,7 +57,6 @@ GOBJECT_INTROSPECTION_MIN_VERSION=1.31.6

 GDATA_MIN_VERSION=0.13.3

 GOA_MIN_VERSION=3.2.0

 TRACKER_MIN_VERSION=0.17.3

-ZAPOJIT_MIN_VERSION=0.0.2

 SOUP_MIN_VERSION=2.41.3

 AC_ARG_ENABLE(documentation,

@@ -85,8 +84,7 @@ PKG_CHECK_MODULES(DOCUMENTS,

                   tracker-control-1.0 >= $TRACKER_MIN_VERSION

                   tracker-sparql-1.0 >= $TRACKER_MIN_VERSION

                   goa-1.0 >= $GOA_MIN_VERSION

-                  libgdata >= $GDATA_MIN_VERSION

-                  zapojit-0.0 >= $ZAPOJIT_MIN_VERSION)

+                  libgdata >= $GDATA_MIN_VERSION)

 # Although GTK+ 3.10 includes hi-dpi functionality, it does not require a cairo with

 # cairo_surface_set_device_scale(), which we also need if we're to support hi-dpi,

diff --git a/src/documents.js b/src/documents.js

index 781019091754..ca48e53db25d 100644

--- a/src/documents.js

+++ b/src/documents.js

@@ -1218,34 +1218,36 @@ const SkydriveDocument = new Lang.Class({

     },

     load: function(passwd, cancellable, callback) {

-        this._createZpjEntry(cancellable, Lang.bind(this,

-            function(entry, service, exception) {

-                if (exception) {

-                    // try loading from the most recent cache, if any

-                    GdPrivate.pdf_loader_load_uri_async(this.identifier, passwd, cancellable, Lang.bind(this,

-                        function(source, res) {

-                            try {

-                                let docModel = GdPrivate.pdf_loader_load_uri_finish(res);

-                                callback(this, docModel, null);

-                            } catch (e) {

-                                // report the outmost error only

-                                callback(this, null, exception);

-                            }

-                        }));

-

+        this.download(true, cancellable, Lang.bind(this,

+            function(fromCache, error) {

+                if (error) {

+                    callback(this, null, error);

                     return;

                 }

-                GdPrivate.pdf_loader_load_zpj_entry_async

-                    (entry, service, cancellable, Lang.bind(this,

-                        function(source, res) {

-                            try {

-                                let docModel = GdPrivate.pdf_loader_load_zpj_entry_finish(res);

-                                callback(this, docModel, null);

-                            } catch (e) {

-                                callback(this, null, e);

+                this.loadLocal(passwd, cancellable, Lang.bind(this,

+                    function(doc, docModel, error) {

+                        if (error) {

+                            if (fromCache &&

+                                !error.matches(EvDocument.DocumentError, EvDocument.DocumentError.ENCRYPTED)) {

+                                this.download(false, cancellable, Lang.bind(this,

+                                    function(fromCache, error) {

+                                        if (error) {

+                                            callback(this, null, error);

+                                            return;

+                                        }

+

+                                        this.loadLocal(passwd, cancellable, callback);

+                                    }));

+                            } else {

+                                callback(this, null, error);

                             }

-                        }));

+

+                            return;

+                        }

+

+                        callback(this, docModel, null);

+                    }));

             }));

     },

diff --git a/src/lib/gd-pdf-loader.c b/src/lib/gd-pdf-loader.c

index 7a8890e75891..202f6cc0a65f 100644

--- a/src/lib/gd-pdf-loader.c

+++ b/src/lib/gd-pdf-loader.c

@@ -51,9 +51,6 @@ typedef struct {

   GDataService *gdata_service;

   gchar *resource_id;

-  ZpjSkydriveEntry *zpj_entry;

-  ZpjSkydrive *zpj_service;

-

   guint64 pdf_cache_mtime;

   guint64 original_file_mtime;

@@ -64,7 +61,6 @@ typedef struct {

 static void pdf_load_job_from_openoffice (PdfLoadJob *job);

 static void pdf_load_job_gdata_refresh_cache (PdfLoadJob *job);

 static void pdf_load_job_openoffice_refresh_cache (PdfLoadJob *job);

-static void pdf_load_job_zpj_refresh_cache (PdfLoadJob *job);

 /* --------------------------- utils -------------------------------- */

@@ -134,8 +130,6 @@ pdf_load_job_free (PdfLoadJob *job)

   g_clear_object (&job->download_file);

   g_clear_object (&job->gdata_service);

   g_clear_object (&job->gdata_entry);

-  g_clear_object (&job->zpj_service);

-  g_clear_object (&job->zpj_entry);

   g_free (job->uri);

   g_free (job->passwd);

@@ -160,7 +154,6 @@ static PdfLoadJob *

 pdf_load_job_new (GSimpleAsyncResult *result,

                   const gchar *uri,

                   GDataEntry *gdata_entry,

-                  ZpjSkydriveEntry *zpj_entry,

                   const gchar *passwd,

                   GCancellable *cancellable)

 {

@@ -178,8 +171,6 @@ pdf_load_job_new (GSimpleAsyncResult *result,

     retval->passwd = g_strdup (passwd);

   if (gdata_entry != NULL)

     retval->gdata_entry = g_object_ref (gdata_entry);

-  if (zpj_entry != NULL)

-    retval->zpj_entry = g_object_ref (zpj_entry);

   if (cancellable != NULL)

     retval->cancellable = g_object_ref (cancellable);

@@ -216,8 +207,6 @@ pdf_load_job_force_refresh_cache (PdfLoadJob *job)

   if (job->gdata_entry != NULL)

     pdf_load_job_gdata_refresh_cache (job);

-  if (job->zpj_entry != NULL)

-    pdf_load_job_zpj_refresh_cache (job);

   else

     pdf_load_job_openoffice_refresh_cache (job);

 }

@@ -429,61 +418,6 @@ pdf_load_job_gdata_refresh_cache (PdfLoadJob *job)

 }

 static void

-zpj_download_stream_ready (GObject *source,

-                       GAsyncResult *res,

-                       gpointer user_data)

-{

-  GError *error = NULL;

-  PdfLoadJob *job = (PdfLoadJob *) user_data;

-  const gchar *name;

-  const gchar *extension;

-

-  job->stream = zpj_skydrive_download_file_to_stream_finish (ZPJ_SKYDRIVE (source), res, &error);

-  if (error != NULL) {

-    pdf_load_job_complete_error (job, error);

-    return;

-  }

-

-  name = zpj_skydrive_entry_get_name (job->zpj_entry);

-  extension = gd_filename_get_extension_offset (name);

-

-  /* If it is not a PDF, we need to convert it afterwards.

-   * http://msdn.microsoft.com/en-us/library/live/hh826545#fileformats

-   */

-  if (g_strcmp0 (extension, ".pdf") != 0)

-    {

-      GFileIOStream *iostream;

-

-      job->download_file = g_file_new_tmp (NULL, &iostream, &error);

-      if (error != NULL) {

-        pdf_load_job_complete_error (job, error);

-        return;

-      }

-

-      /* We don't need the iostream. */

-      g_io_stream_close (G_IO_STREAM (iostream), NULL, NULL);

-    }

-  else

-    job->download_file = g_file_new_for_path (job->pdf_path);

-

-  g_file_replace_async (job->download_file, NULL, FALSE,

-                        G_FILE_CREATE_PRIVATE,

-                        G_PRIORITY_DEFAULT,

-                        job->cancellable, file_replace_ready_cb,

-                        job);

-}

-

-static void

-pdf_load_job_zpj_refresh_cache (PdfLoadJob *job)

-{

-  zpj_skydrive_download_file_to_stream_async (job->zpj_service,

-                                              ZPJ_SKYDRIVE_FILE (job->zpj_entry),

-                                              job->cancellable,

-                                              zpj_download_stream_ready,

-                                              job);

-}

-

-static void

 gdata_cache_query_info_ready_cb (GObject *source,

                                  GAsyncResult *res,

                                  gpointer user_data)

@@ -518,40 +452,6 @@ gdata_cache_query_info_ready_cb (GObject *source,

 }

 static void

-zpj_cache_query_info_ready_cb (GObject *source,

-                               GAsyncResult *res,

-                               gpointer user_data)

-{

-  PdfLoadJob *job = user_data;

-  GError *error = NULL;

-  GFileInfo *info;

-  guint64 cache_mtime;

-

-  info = g_file_query_info_finish (G_FILE (source), res, &error);

-

-  if (error != NULL) {

-    /* create/invalidate cache */

-    pdf_load_job_zpj_refresh_cache (job);

-    g_error_free (error);

-

-    return;

-  }

-

-  job->pdf_cache_mtime = cache_mtime =

-    g_file_info_get_attribute_uint64 (info, G_FILE_ATTRIBUTE_TIME_MODIFIED);

-  g_object_unref (info);

-

-  if (job->original_file_mtime != cache_mtime) {

-    pdf_load_job_zpj_refresh_cache (job);

-  } else {

-    job->from_old_cache = TRUE;

-

-    /* load the cached file */

-    pdf_load_job_from_pdf (job);

-  }

-}

-

-static void

 pdf_load_job_from_google_documents (PdfLoadJob *job)

 {

   gchar *tmp_name;

@@ -583,39 +483,6 @@ pdf_load_job_from_google_documents (PdfLoadJob *job)

 }

 static void

-pdf_load_job_from_skydrive (PdfLoadJob *job)

-{

-  gchar *tmp_name;

-  gchar *tmp_path, *pdf_path;

-  GDateTime *updated_time;

-  GFile *pdf_file;

-

-  updated_time = zpj_skydrive_entry_get_updated_time (job->zpj_entry);

-  job->original_file_mtime = (guint64) g_date_time_to_unix (updated_time);

-

-  tmp_name = g_strdup_printf ("gnome-documents-%u.pdf",

-                              g_str_hash (zpj_skydrive_entry_get_id (job->zpj_entry)));

-  tmp_path = g_build_filename (g_get_user_cache_dir (), "gnome-documents", NULL);

-  job->pdf_path = pdf_path =

-    g_build_filename (tmp_path, tmp_name, NULL);

-  g_mkdir_with_parents (tmp_path, 0700);

-

-  pdf_file = g_file_new_for_path (pdf_path);

-

-  g_file_query_info_async (pdf_file,

-                           G_FILE_ATTRIBUTE_TIME_MODIFIED,

-                           G_FILE_QUERY_INFO_NONE,

-                           G_PRIORITY_DEFAULT,

-                           job->cancellable,

-                           zpj_cache_query_info_ready_cb,

-                           job);

-

-  g_free (tmp_name);

-  g_free (tmp_path);

-  g_object_unref (pdf_file);

-}

-

-static void

 pdf_load_job_from_gdata_cache (PdfLoadJob *job)

 {

   gchar *tmp_name;

@@ -633,23 +500,6 @@ pdf_load_job_from_gdata_cache (PdfLoadJob *job)

 }

 static void

-pdf_load_job_from_zpj_cache (PdfLoadJob *job)

-{

-  gchar *tmp_name;

-  gchar *tmp_path;

-

-  tmp_name = g_strdup_printf ("gnome-documents-%u.pdf",

-                              g_str_hash (job->resource_id));

-  tmp_path = g_build_filename (g_get_user_cache_dir (), "gnome-documents", NULL);

-  job->pdf_path = g_build_filename (tmp_path, tmp_name, NULL);

-

-  pdf_load_job_from_pdf (job);

-

-  g_free (tmp_path);

-  g_free (tmp_name);

-}

-

-static void

 unoconv_cancelled_cb (GCancellable *cancellable,

                       gpointer user_data)

 {

@@ -1134,7 +984,6 @@ pdf_load_job_from_uri (PdfLoadJob *job)

 {

   GFile *file;

   const gchar *gdata_prefix = "google:drive:";

-  const gchar *zpj_prefix = "windows-live:skydrive:";

   if (g_str_has_prefix (job->uri, gdata_prefix)) {

     job->resource_id = g_strdup (job->uri + strlen (gdata_prefix));

@@ -1142,12 +991,6 @@ pdf_load_job_from_uri (PdfLoadJob *job)

     return;

   }