compiler fixes

[grits] / src / data.c

diff --git a/src/data.c b/src/data.c
index 007c4234e84a6ef3214c375bd7c55634a70a9b87..d57a8c713c706b8a4fbadfe95d69413860ad5f34 100644 (file)
--- a/src/data.c
+++ b/src/data.c
@@ -45,13 +45,14 @@ static goffset g_file_get_size(GFile *file)
 
 static void cache_file_cb(GObject *source_object, GAsyncResult *res, gpointer _info)
 {
+       g_debug("data: cache_file_cb");
        cache_file_end_t *info = _info;
        char   *url   = g_file_get_path(info->src);
        char   *local = g_file_get_path(info->dst);
        GError *error = NULL;
        g_file_copy_finish(G_FILE(source_object), res, &error);
        if (error) {
-               g_message("error copying file ([%s]->[%s]): %s",
+               g_warning("data: error copying file ([%s]->[%s]): %s",
                        url, local, error->message);
                g_error_free(error);
        } else {
@@ -68,12 +69,15 @@ static void do_cache(GFile *src, GFile *dst, char *reason,
                AWeatherCacheDoneCallback callback, gpointer user_data)
 {
        char *name = g_file_get_basename(dst);
-       g_message("Caching file %s: %s", name, reason);
+       g_debug("data: do_cache - Caching file %s: %s", name, reason);
        g_free(name);
 
        GFile *parent = g_file_get_parent(dst);
-       if (!g_file_query_exists(parent, NULL))
-               g_file_make_directory_with_parents(parent, NULL, NULL);
+       if (!g_file_query_exists(parent, NULL)) {
+               char *path = g_file_get_path(parent);
+               g_mkdir_with_parents(path, 0755);
+               g_free(path);
+       }
        g_object_unref(parent);
 
        cache_file_end_t *info = g_malloc0(sizeof(cache_file_end_t));
@@ -82,17 +86,17 @@ static void do_cache(GFile *src, GFile *dst, char *reason,
        info->dst       = dst;
        info->user_data = user_data;
        g_file_copy_async(src, dst,
-               G_FILE_COPY_OVERWRITE, // GFileCopyFlags flags,
-               0,                     // int io_priority,
-               NULL,                  // GCancellable *cancellable,
-               NULL,                  // GFileProgressCallback progress_callback,
-               NULL,                  // gpointer progress_callback_data,
-               cache_file_cb,         // GAsyncReadyCallback callback,
-               info);                 // gpointer user_data
+               G_FILE_COPY_OVERWRITE,   // GFileCopyFlags flags,
+               G_PRIORITY_DEFAULT_IDLE, // int io_priority,
+               NULL,                    // GCancellable *cancellable,
+               NULL,                    // GFileProgressCallback progress_callback,
+               NULL,                    // gpointer progress_callback_data,
+               cache_file_cb,           // GAsyncReadyCallback callback,
+               info);                   // gpointer user_data
        return;
 }
 
-/**
+/*
  * Cache a image from Ridge to the local disk
  * \param  path  Path to the Ridge file, starting after /ridge/
  * \return The local path to the cached image