Documentation: Use G_SOURCE_CONTINUE and G_SOURCE_REMOVE

[geeqie.git] / src / cache-maint.cc

diff --git a/src/cache-maint.cc b/src/cache-maint.cc
index 06e4df3..e8c8c24 100644 (file)
--- a/src/cache-maint.cc
+++ b/src/cache-maint.cc
@@ -216,10 +216,10 @@ static gboolean cache_maintain_home_cb(gpointer data)
                DEBUG_1("purge chk done.");
                cm->idle_id = 0;
                cache_maintain_home_stop(cm);
-               return FALSE;
+               return G_SOURCE_REMOVE;
                }
 
-       fd = cm->list->data;
+       fd = static_cast<FileData *>(cm->list->data);
 
        DEBUG_1("purge chk (%d) \"%s\"", (cm->clear && !cm->metadata), fd->path);
 
@@ -292,7 +292,7 @@ static gboolean cache_maintain_home_cb(gpointer data)
                                }
                        }
 
-               fd = cm->list->data;
+               fd = static_cast<FileData *>(cm->list->data);
                cm->done_list = g_list_remove(cm->done_list, fd);
                cm->list = g_list_remove(cm->list, fd);
                file_data_unref(fd);
@@ -302,7 +302,7 @@ static gboolean cache_maintain_home_cb(gpointer data)
                {
                const gchar *buf;
 
-               fd = cm->list->data;
+               fd = static_cast<FileData *>(cm->list->data);
                if (strlen(fd->path) > base_length)
                        {
                        buf = fd->path + base_length;
@@ -314,7 +314,7 @@ static gboolean cache_maintain_home_cb(gpointer data)
                gtk_entry_set_text(GTK_ENTRY(cm->entry), buf);
                }
 
-       return TRUE;
+       return G_SOURCE_CONTINUE;
 }
 
 static void cache_maintain_home_close_cb(GenericDialog *UNUSED(gd), gpointer data)
@@ -738,7 +738,7 @@ static gboolean cache_manager_render_file(CacheOpsData *cd)
                FileData *fd;
                gint success;
 
-               fd = cd->list->data;
+               fd = static_cast<FileData *>(cd->list->data);
                cd->list = g_list_remove(cd->list, fd);
 
                cd->tl = (ThumbLoaderStd *)thumb_loader_new(options->thumbnails.max_width, options->thumbnails.max_height);
@@ -771,7 +771,7 @@ static gboolean cache_manager_render_file(CacheOpsData *cd)
                {
                FileData *fd;
 
-               fd = cd->list_dir->data;
+               fd = static_cast<FileData *>(cd->list_dir->data);
                cd->list_dir = g_list_remove(cd->list_dir, fd);
 
                cache_manager_render_folder(cd, fd);
@@ -1010,7 +1010,7 @@ static gint cache_manager_standard_clean_clear_cb(gpointer data)
                {
                FileData *next_fd;
 
-               next_fd = cd->list->data;
+               next_fd = static_cast<FileData *>(cd->list->data);
                cd->list = g_list_remove(cd->list, next_fd);
 
                DEBUG_1("thumb removed: %s", next_fd->path);
@@ -1028,12 +1028,12 @@ static gint cache_manager_standard_clean_clear_cb(gpointer data)
                                }
                        }
 
-               return TRUE;
+               return G_SOURCE_CONTINUE;
                }
 
        cd->idle_id = 0;
        cache_manager_standard_clean_done(cd);
-       return FALSE;
+       return G_SOURCE_REMOVE;
 }
 
 static void cache_manager_standard_clean_valid_cb(const gchar *path, gboolean valid, gpointer data)
@@ -1064,7 +1064,7 @@ static void cache_manager_standard_clean_valid_cb(const gchar *path, gboolean va
                {
                FileData *next_fd;
 
-               next_fd = cd->list->data;
+               next_fd = static_cast<FileData *>(cd->list->data);
                cd->list = g_list_remove(cd->list, next_fd);
 
                cd->tl = thumb_loader_std_thumb_file_validate(next_fd->path, cd->days,
@@ -1416,10 +1416,10 @@ static gboolean cache_manager_sim_file(CacheOpsData *cd)
        if (cd->list)
                {
                FileData *fd;
-               fd = cd->list->data;
+               fd = static_cast<FileData *>(cd->list->data);
                cd->list = g_list_remove(cd->list, fd);
 
-               load_mask = CACHE_LOADER_DIMENSIONS | CACHE_LOADER_DATE | CACHE_LOADER_MD5SUM | CACHE_LOADER_SIMILARITY;
+               load_mask = static_cast<CacheDataType>(CACHE_LOADER_DIMENSIONS | CACHE_LOADER_DATE | CACHE_LOADER_MD5SUM | CACHE_LOADER_SIMILARITY);
                cd->cl = (CacheLoader *)cache_loader_new(fd, load_mask, (cache_manager_sim_file_done_cb), cd);
 
                if (!cd->remote)
@@ -1440,7 +1440,7 @@ static gboolean cache_manager_sim_file(CacheOpsData *cd)
                {
                FileData *fd;
 
-               fd = cd->list_dir->data;
+               fd = static_cast<FileData *>(cd->list_dir->data);
                cd->list_dir = g_list_remove(cd->list_dir, fd);
 
                cache_manager_sim_folder((CacheOpsData *)cd, fd);