[gnome-photos/wip/rishi/collection] Fix build (should be squashed)

[Umang Jain <uajain src gnome org>]

commit c01341bb792a20f4dd58854734f66afe865d4a1d
Author: Umang Jain <mailumangjain gmail com>
Date:   Mon Feb 5 13:05:04 2018 +0530

    Fix build (should be squashed)

 src/photos-application.c | 1 +
 src/photos-glib.c        | 3 ++-
 src/photos-glib.h        | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)
---
diff --git a/src/photos-application.c b/src/photos-application.c
index 2101ee53..cf44b7ca 100644
--- a/src/photos-application.c
+++ b/src/photos-application.c
@@ -1051,6 +1051,7 @@ photos_application_import (PhotosApplication *self)
   PhotosSource *source;
   const gchar *pictures_path;
   g_autofree gchar *date_created_latest_str = NULL;
+  g_autofree gchar *export_path = NULL;
   g_autofree gchar *import_sub_path = NULL;
   gint64 ctime_latest = -1;
 
diff --git a/src/photos-glib.c b/src/photos-glib.c
index e48a4707..a1ee21ad 100644
--- a/src/photos-glib.c
+++ b/src/photos-glib.c
@@ -125,6 +125,7 @@ photos_glib_file_copy_splice (GObject *source_object, GAsyncResult *res, gpointe
 static void
 photos_glib_file_copy_read (GObject *source_object, GAsyncResult *res, gpointer user_data)
 {
+  GCancellable *cancellable;
   GFile *source = G_FILE (source_object);
   g_autoptr (GFileOutputStream) istream = NULL;
   g_autoptr (GTask) task = G_TASK (user_data);
@@ -229,7 +230,7 @@ photos_glib_file_copy_async (GFile *source,
 
 
 gboolean
-photos_glib_file_copy_finish (GFile *file, GAsyncResult *res, GError *error)
+photos_glib_file_copy_finish (GFile *file, GAsyncResult *res, GError **error)
 {
   GTask *task;
 
diff --git a/src/photos-glib.h b/src/photos-glib.h
index eec5b836..57c339a0 100644
--- a/src/photos-glib.h
+++ b/src/photos-glib.h
@@ -40,7 +40,7 @@ void                  photos_glib_file_copy_async                (GFile *source,
                                                                   GAsyncReadyCallback callback,
                                                                   gpointer user_data);
 
-gboolean              photos_glib_file_copy_finish               (GFile *file, GAsyncResult *res, GError 
*error);
+gboolean              photos_glib_file_copy_finish               (GFile *file, GAsyncResult *res, GError 
**error);
 
 void                  photos_glib_file_create_async              (GFile *file,
                                                                   GFileCreateFlags flags,