Remove commented out code.

[geeqie.git] / src / thumb_standard.h

diff --git a/src/thumb_standard.h b/src/thumb_standard.h
index 840e341..944d255 100644 (file)
--- a/src/thumb_standard.h
+++ b/src/thumb_standard.h
@@ -1,6 +1,7 @@
 /*
- * GQview
- * (C) 2005 John Ellis
+ * Geeqie
+ * (C) 2006 John Ellis
+ * Copyright (C) 2008 - 2012 The Geeqie Team
  *
  * Author: John Ellis
  *
@@ -14,10 +15,11 @@
 #define THUMB_STANDARD_H
 
 
-#define THUMB_FOLDER        ".thumbnails"
+#define THUMB_FOLDER_GLOBAL ".thumbnails"
+#define THUMB_FOLDER_LOCAL  ".thumblocal"
 #define THUMB_FOLDER_NORMAL "normal"
 #define THUMB_FOLDER_LARGE  "large"
-#define THUMB_FOLDER_FAIL   "fail/gqview-1.0"
+#define THUMB_FOLDER_FAIL   "fail" G_DIR_SEPARATOR_S GQ_APPNAME_LC "-" VERSION
 #define THUMB_NAME_EXTENSION ".png"
 
 
@@ -26,12 +28,10 @@ typedef void (* ThumbLoaderStdFunc)(ThumbLoaderStd *tl, gpointer data);
 
 struct _ThumbLoaderStd
 {
-       gint standard_loader;
+       gboolean standard_loader;
 
-       GdkPixbuf *pixbuf;
        ImageLoader *il;
-
-       gchar *source_path;
+       FileData *fd;
 
        time_t source_mtime;
        off_t source_size;
@@ -41,15 +41,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,11 +67,11 @@ 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, const gchar *path);
+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, gint with_fallback);
+GdkPixbuf *thumb_loader_std_get_pixbuf(ThumbLoaderStd *tl);
 
 
 /* validates a non local thumbnail file,
@@ -79,7 +79,7 @@ GdkPixbuf *thumb_loader_std_get_pixbuf(ThumbLoaderStd *tl, gint with_fallback);
  * 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);
 
@@ -89,3 +89,4 @@ void thumb_std_maint_moved(const gchar *source, const gchar *dest);
 
 
 #endif
+/* vim: set shiftwidth=8 softtabstop=0 cindent cinoptions={1s: */