Documentation: Use G_SOURCE_CONTINUE and G_SOURCE_REMOVE

[geeqie.git] / src / collect-io.cc

diff --git a/src/collect-io.cc b/src/collect-io.cc
index 6997cea..db16195 100644 (file)
--- a/src/collect-io.cc
+++ b/src/collect-io.cc
@@ -271,7 +271,7 @@ static gboolean collection_load_private(CollectionData *cd, const gchar *path, C
 
 gboolean collection_load(CollectionData *cd, const gchar *path, CollectionLoadFlags flags)
 {
-       if (collection_load_private(cd, path, flags | COLLECTION_LOAD_FLUSH))
+       if (collection_load_private(cd, path, static_cast<CollectionLoadFlags>(flags | COLLECTION_LOAD_FLUSH)))
                {
                layout_recent_add_path(cd->path);
                return TRUE;
@@ -883,12 +883,12 @@ static gboolean collect_manager_process_cb(gpointer UNUSED(data))
 {
        if (collection_manager_action_list) collect_manager_refresh();
        collect_manager_process_actions(COLLECT_MANAGER_ACTIONS_PER_IDLE);
-       if (collection_manager_action_list) return TRUE;
+       if (collection_manager_action_list) return G_SOURCE_CONTINUE;
 
-       if (collect_manager_process_entry_list()) return TRUE;
+       if (collect_manager_process_entry_list()) return G_SOURCE_CONTINUE;
 
        DEBUG_1("collection manager is up to date");
-       return FALSE;
+       return G_SOURCE_REMOVE;
 }
 
 static gboolean collect_manager_timer_cb(gpointer UNUSED(data))
@@ -1020,8 +1020,8 @@ void collect_manager_notify_cb(FileData *fd, NotifyType type, gpointer UNUSED(da
 
 static gint collection_manager_sort_cb(gconstpointer a, gconstpointer b)
 {
-       const gchar *char_a = a;
-       const gchar *char_b = b;
+       const gchar *char_a = static_cast<const gchar *>(a);
+       const gchar *char_b = static_cast<const gchar *>(b);
 
        return g_strcmp0(char_a, char_b);
 }