Fix #314: Remote commands for thumbnail maintenance

[geeqie.git] / src / thumb_standard.h

diff --git a/src/thumb_standard.h b/src/thumb_standard.h
index 1be6f8d..2b5c934 100644 (file)
--- a/src/thumb_standard.h
+++ b/src/thumb_standard.h
@@ -1,21 +1,33 @@
 /*
- * Geeqie
- * (C) 2006 John Ellis
- * Copyright (C) 2008 - 2009 The Geeqie Team
+ * Copyright (C) 2006 John Ellis
+ * Copyright (C) 2008 - 2016 The Geeqie Team
  *
  * Author: John Ellis
  *
- * This software is released under the GNU General Public License (GNU GPL).
- * Please read the included file COPYING for more information.
- * This software comes with no warranty of any kind, use at your own risk!
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-
 #ifndef THUMB_STANDARD_H
 #define THUMB_STANDARD_H
 
 
+#if GLIB_CHECK_VERSION (2, 34, 0)
+#define THUMB_FOLDER_GLOBAL ".cache/thumbnails"
+#else
 #define THUMB_FOLDER_GLOBAL ".thumbnails"
+#endif
 #define THUMB_FOLDER_LOCAL  ".thumblocal"
 #define THUMB_FOLDER_NORMAL "normal"
 #define THUMB_FOLDER_LARGE  "large"
@@ -28,7 +40,7 @@ typedef void (* ThumbLoaderStdFunc)(ThumbLoaderStd *tl, gpointer data);
 
 struct _ThumbLoaderStd
 {
-       gint standard_loader;
+       gboolean standard_loader;
 
        ImageLoader *il;
        FileData *fd;
@@ -41,15 +53,15 @@ struct _ThumbLoaderStd
        gchar *thumb_uri;
        const gchar *local_uri;
 
-       gint thumb_path_local;
+       gboolean thumb_path_local;
 
        gint requested_width;
        gint requested_height;
 
-       gint cache_enable;
-       gint cache_local;
-       gint cache_hit;
-       gint cache_retry;
+       gboolean cache_enable;
+       gboolean cache_local;
+       gboolean cache_hit;
+       gboolean cache_retry;
 
        gdouble progress;
 
@@ -67,8 +79,8 @@ void thumb_loader_std_set_callbacks(ThumbLoaderStd *tl,
                                    ThumbLoaderStdFunc func_error,
                                    ThumbLoaderStdFunc func_progress,
                                    gpointer data);
-void thumb_loader_std_set_cache(ThumbLoaderStd *tl, gint enable_cache, gint local, gint retry_failed);
-gint thumb_loader_std_start(ThumbLoaderStd *tl, FileData *fd);
+void thumb_loader_std_set_cache(ThumbLoaderStd *tl, gboolean enable_cache, gboolean local, gboolean retry_failed);
+gboolean thumb_loader_std_start(ThumbLoaderStd *tl, FileData *fd);
 void thumb_loader_std_free(ThumbLoaderStd *tl);
 
 GdkPixbuf *thumb_loader_std_get_pixbuf(ThumbLoaderStd *tl);
@@ -79,7 +91,7 @@ GdkPixbuf *thumb_loader_std_get_pixbuf(ThumbLoaderStd *tl);
  * for thumbnail's without a file: uri, validates against allowed_age in days
  */
 ThumbLoaderStd *thumb_loader_std_thumb_file_validate(const gchar *thumb_path, gint allowed_age,
-                                                    void (*func_valid)(const gchar *path, gint valid, gpointer data),
+                                                    void (*func_valid)(const gchar *path, gboolean valid, gpointer data),
                                                     gpointer data);
 void thumb_loader_std_thumb_file_validate_cancel(ThumbLoaderStd *tl);