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 0451bcc..e8c8c24 100644 (file)
--- a/src/cache-maint.cc
+++ b/src/cache-maint.cc
@@ -190,7 +190,7 @@ static void cache_maintain_home_stop(CMData *cm)
 
 static gboolean cache_maintain_home_cb(gpointer data)
 {
-       CMData *cm = data;
+       CMData *cm = static_cast<CMData *>(data);
        GList *dlist = NULL;
        GList *list = NULL;
        FileData *fd;
@@ -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);
 
@@ -244,7 +244,7 @@ static gboolean cache_maintain_home_cb(gpointer data)
                        work = list;
                        while (work)
                                {
-                               FileData *fd_list = work->data;
+                               FileData *fd_list = static_cast<FileData *>(work->data);
                                gchar *path_buf = g_strdup(fd_list->path);
                                gchar *dot;
 
@@ -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,12 +314,12 @@ 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)
 {
-       CMData *cm = data;
+       CMData *cm = static_cast<CMData *>(data);
 
        if (!gtk_widget_get_sensitive(cm->button_close)) return;
 
@@ -328,7 +328,7 @@ static void cache_maintain_home_close_cb(GenericDialog *UNUSED(gd), gpointer dat
 
 static void cache_maintain_home_stop_cb(GenericDialog *UNUSED(gd), gpointer data)
 {
-       CMData *cm = data;
+       CMData *cm = static_cast<CMData *>(data);
 
        cache_maintain_home_stop(cm);
 }
@@ -666,7 +666,7 @@ static void cache_manager_render_reset(CacheOpsData *cd)
 
 static void cache_manager_render_close_cb(GenericDialog *UNUSED(fd), gpointer data)
 {
-       CacheOpsData *cd = data;
+       CacheOpsData *cd = static_cast<CacheOpsData *>(data);
 
        if (!gtk_widget_get_sensitive(cd->button_close)) return;
 
@@ -692,7 +692,7 @@ static void cache_manager_render_finish(CacheOpsData *cd)
 
 static void cache_manager_render_stop_cb(GenericDialog *UNUSED(fd), gpointer data)
 {
-       CacheOpsData *cd = data;
+       CacheOpsData *cd = static_cast<CacheOpsData *>(data);
 
        gtk_entry_set_text(GTK_ENTRY(cd->progress), _("stopped"));
        cache_manager_render_finish(cd);
@@ -723,7 +723,7 @@ static gboolean cache_manager_render_file(CacheOpsData *cd);
 
 static void cache_manager_render_thumb_done_cb(ThumbLoader *UNUSED(tl), gpointer data)
 {
-       CacheOpsData *cd = data;
+       CacheOpsData *cd = static_cast<CacheOpsData *>(data);
 
        thumb_loader_free((ThumbLoader *)cd->tl);
        cd->tl = NULL;
@@ -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);
@@ -797,7 +797,7 @@ static gboolean cache_manager_render_file(CacheOpsData *cd)
 
 static void cache_manager_render_start_cb(GenericDialog *UNUSED(fd), gpointer data)
 {
-       CacheOpsData *cd = data;
+       CacheOpsData *cd = static_cast<CacheOpsData *>(data);
        gchar *path;
        GList *list_total = NULL;
 
@@ -961,7 +961,7 @@ void cache_manager_render_remote(const gchar *path, gboolean recurse, gboolean l
 
 static void cache_manager_standard_clean_close_cb(GenericDialog *UNUSED(gd), gpointer data)
 {
-       CacheOpsData *cd = data;
+       CacheOpsData *cd = static_cast<CacheOpsData *>(data);
 
        if (!gtk_widget_get_sensitive(cd->button_close)) return;
 
@@ -997,20 +997,20 @@ static void cache_manager_standard_clean_done(CacheOpsData *cd)
 
 static void cache_manager_standard_clean_stop_cb(GenericDialog *UNUSED(gd), gpointer data)
 {
-       CacheOpsData *cd = data;
+       CacheOpsData *cd = static_cast<CacheOpsData *>(data);
 
        cache_manager_standard_clean_done(cd);
 }
 
 static gint cache_manager_standard_clean_clear_cb(gpointer data)
 {
-       CacheOpsData *cd = data;
+       CacheOpsData *cd = static_cast<CacheOpsData *>(data);
 
        if (cd->list)
                {
                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,17 +1028,17 @@ 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)
 {
-       CacheOpsData *cd = data;
+       CacheOpsData *cd = static_cast<CacheOpsData *>(data);
 
        if (path)
                {
@@ -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,
@@ -1079,7 +1079,7 @@ static void cache_manager_standard_clean_valid_cb(const gchar *path, gboolean va
 
 static void cache_manager_standard_clean_start(GenericDialog *UNUSED(gd), gpointer data)
 {
-       CacheOpsData *cd = data;
+       CacheOpsData *cd = static_cast<CacheOpsData *>(data);
        GList *list;
        gchar *path;
        FileData *dir_fd;
@@ -1303,7 +1303,7 @@ static void cache_manager_sim_reset(CacheOpsData *cd)
 
 static void cache_manager_sim_close_cb(GenericDialog *UNUSED(fd), gpointer data)
 {
-       CacheOpsData *cd = data;
+       CacheOpsData *cd = static_cast<CacheOpsData *>(data);
 
        if (!gtk_widget_get_sensitive(cd->button_close)) return;
 
@@ -1328,7 +1328,7 @@ static void cache_manager_sim_finish(CacheOpsData *cd)
 
 static void cache_manager_sim_stop_cb(GenericDialog *UNUSED(fd), gpointer data)
 {
-       CacheOpsData *cd = data;
+       CacheOpsData *cd = static_cast<CacheOpsData *>(data);
 
        gtk_entry_set_text(GTK_ENTRY(cd->progress), _("stopped"));
        cache_manager_sim_finish(cd);
@@ -1357,7 +1357,7 @@ static void cache_manager_sim_folder(CacheOpsData *cd, FileData *dir_fd)
 
 static void cache_manager_sim_file_done_cb(CacheLoader *UNUSED(cl), gint UNUSED(error), gpointer data)
 {
-       CacheOpsData *cd = data;
+       CacheOpsData *cd = static_cast<CacheOpsData *>(data);
 
        cache_loader_free((CacheLoader *)cd->cl);
        cd->cl = NULL;
@@ -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);
@@ -1466,7 +1466,7 @@ static gboolean cache_manager_sim_file(CacheOpsData *cd)
 
 static void cache_manager_sim_start_cb(GenericDialog *UNUSED(fd), gpointer data)
 {
-       CacheOpsData *cd = data;
+       CacheOpsData *cd = static_cast<CacheOpsData *>(data);
        gchar *path;
        GList *list_total = NULL;
 
@@ -1585,7 +1585,7 @@ static void cache_manager_sim_load_cb(GtkWidget *widget, gpointer UNUSED(data))
 
 static void cache_manager_cache_maintenance_close_cb(GenericDialog *UNUSED(fd), gpointer data)
 {
-       CacheOpsData *cd = data;
+       CacheOpsData *cd = static_cast<CacheOpsData *>(data);
 
        if (!gtk_widget_get_sensitive(cd->button_close)) return;
 
@@ -1596,7 +1596,7 @@ static void cache_manager_cache_maintenance_close_cb(GenericDialog *UNUSED(fd),
 
 static void cache_manager_cache_maintenance_start_cb(GenericDialog *UNUSED(fd), gpointer data)
 {
-       CacheOpsData *cd = data;
+       CacheOpsData *cd = static_cast<CacheOpsData *>(data);
        gchar *path;
        gchar *cmd_line;