From 28f131621477e012c0553d4eb52bf9947ab98264 Mon Sep 17 00:00:00 2001 From: Colin Clark Date: Wed, 24 May 2023 14:03:14 +0100 Subject: [PATCH] Documentation: Use G_SOURCE_CONTINUE and G_SOURCE_REMOVE --- src/bar-gps.cc | 4 ++-- src/bar-histogram.cc | 6 +++--- src/bar-keywords.cc | 2 +- src/cache-loader.cc | 8 ++++---- src/cache-maint.cc | 8 ++++---- src/collect-io.cc | 6 +++--- src/collect-table.cc | 8 ++++---- src/dupe.cc | 22 +++++++++++----------- src/histogram.cc | 4 ++-- src/image-load.cc | 20 ++++++++++---------- src/image-overlay.cc | 2 +- src/layout-util.cc | 6 +++--- src/layout.cc | 2 +- src/pan-view/pan-view.cc | 8 ++++---- src/preferences.cc | 12 ++++++------ src/remote.cc | 6 +++--- src/renderer-tiles.cc | 12 ++++++------ src/search-and-run.cc | 2 +- src/search.cc | 10 +++++----- src/thumb-standard.cc | 6 +++--- src/thumb.cc | 2 +- src/ui-tree-edit.cc | 2 +- src/ui-utildlg.cc | 2 +- src/utilops.cc | 12 ++++++------ src/view-dir.cc | 2 +- src/view-file/view-file-list.cc | 4 ++-- src/view-file/view-file.cc | 12 ++++++------ 27 files changed, 95 insertions(+), 95 deletions(-) diff --git a/src/bar-gps.cc b/src/bar-gps.cc index 17a7400f..d0abf24b 100644 --- a/src/bar-gps.cc +++ b/src/bar-gps.cc @@ -500,7 +500,7 @@ static gboolean bar_pane_gps_create_markers_cb(gpointer data) champlain_bounding_box_extend(pgd->bbox, latitude, longitude); } - return TRUE; + return G_SOURCE_CONTINUE; } if (pgd->centre_map_checked) @@ -519,7 +519,7 @@ static gboolean bar_pane_gps_create_markers_cb(gpointer data) gtk_progress_bar_set_text(GTK_PROGRESS_BAR(pgd->progress), NULL); pgd->create_markers_id = 0; - return FALSE; + return G_SOURCE_REMOVE; } static void bar_pane_gps_update(PaneGPSData *pgd) diff --git a/src/bar-histogram.cc b/src/bar-histogram.cc index a35d7b09..15fa54ec 100644 --- a/src/bar-histogram.cc +++ b/src/bar-histogram.cc @@ -90,20 +90,20 @@ static gboolean bar_pane_histogram_update_cb(gpointer data) gtk_widget_queue_draw_area(GTK_WIDGET(phd->drawing_area), 0, 0, phd->histogram_width, phd->histogram_height); - if (phd->fd == NULL) return FALSE; + if (phd->fd == NULL) return G_SOURCE_REMOVE; histmap = histmap_get(phd->fd); if (!histmap) { histmap_start_idle(phd->fd); - return FALSE; + return G_SOURCE_REMOVE; } phd->pixbuf = gdk_pixbuf_new(GDK_COLORSPACE_RGB, FALSE, 8, phd->histogram_width, phd->histogram_height); gdk_pixbuf_fill(phd->pixbuf, 0xffffffff); histogram_draw(phd->histogram, histmap, phd->pixbuf, 0, 0, phd->histogram_width, phd->histogram_height); - return FALSE; + return G_SOURCE_REMOVE; } diff --git a/src/bar-keywords.cc b/src/bar-keywords.cc index 32876ea9..4076b8ec 100644 --- a/src/bar-keywords.cc +++ b/src/bar-keywords.cc @@ -504,7 +504,7 @@ static gboolean bar_pane_keywords_changed_idle_cb(gpointer data) bar_pane_keywords_write(pkd); bar_keyword_tree_sync(pkd); pkd->idle_id = 0; - return FALSE; + return G_SOURCE_REMOVE; } static void bar_pane_keywords_changed(GtkTextBuffer *UNUSED(buffer), gpointer data) diff --git a/src/cache-loader.cc b/src/cache-loader.cc index ce2b4f96..943a7589 100644 --- a/src/cache-loader.cc +++ b/src/cache-loader.cc @@ -56,7 +56,7 @@ static gboolean cache_loader_phase1_process(CacheLoader *cl) g_signal_connect(G_OBJECT(cl->il), "done", (GCallback)cache_loader_phase1_done_cb, cl); if (image_loader_start(cl->il)) { - return FALSE; + return G_SOURCE_REMOVE; } cl->error = TRUE; @@ -65,7 +65,7 @@ static gboolean cache_loader_phase1_process(CacheLoader *cl) cl->idle_id = g_idle_add(cache_loader_phase2_idle_cb, cl); - return FALSE; + return G_SOURCE_REMOVE; } static gboolean cache_loader_phase2_process(CacheLoader *cl) @@ -196,10 +196,10 @@ static gboolean cache_loader_phase2_process(CacheLoader *cl) cl->done_func(cl, cl->error, cl->done_data); } - return FALSE; + return G_SOURCE_REMOVE; } - return TRUE; + return G_SOURCE_CONTINUE; } static gboolean cache_loader_phase1_idle_cb(gpointer data) diff --git a/src/cache-maint.cc b/src/cache-maint.cc index f27d7ccb..e8c8c247 100644 --- a/src/cache-maint.cc +++ b/src/cache-maint.cc @@ -216,7 +216,7 @@ 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 = static_cast(cm->list->data); @@ -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) @@ -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) diff --git a/src/collect-io.cc b/src/collect-io.cc index c90236a0..db16195a 100644 --- a/src/collect-io.cc +++ b/src/collect-io.cc @@ -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)) diff --git a/src/collect-table.cc b/src/collect-table.cc index 5841c509..81f65c2a 100644 --- a/src/collect-table.cc +++ b/src/collect-table.cc @@ -1611,7 +1611,7 @@ static gboolean collection_table_auto_scroll_idle_cb(gpointer data) GdkSeat *seat; GdkDevice *device; - if (!ct->drop_idle_id) return FALSE; + if (!ct->drop_idle_id) return G_SOURCE_REMOVE; window = gtk_widget_get_window(ct->listview); seat = gdk_display_get_default_seat(gdk_window_get_display(window)); @@ -1626,7 +1626,7 @@ static gboolean collection_table_auto_scroll_idle_cb(gpointer data) } ct->drop_idle_id = 0; - return FALSE; + return G_SOURCE_REMOVE; } static gboolean collection_table_auto_scroll_notify_cb(GtkWidget *UNUSED(widget), gint UNUSED(x), gint UNUSED(y), gpointer data) @@ -1976,12 +1976,12 @@ static gboolean collection_table_sync_idle_cb(gpointer data) { CollectTable *ct = static_cast(data); - if (!ct->sync_idle_id) return FALSE; + if (!ct->sync_idle_id) return G_SOURCE_REMOVE; g_source_remove(ct->sync_idle_id); ct->sync_idle_id = 0; collection_table_sync(ct); - return FALSE; + return G_SOURCE_REMOVE; } static void collection_table_sync_idle(CollectTable *ct) diff --git a/src/dupe.cc b/src/dupe.cc index 788c0c76..8ea13e9d 100644 --- a/src/dupe.cc +++ b/src/dupe.cc @@ -2429,7 +2429,7 @@ static gboolean dupe_check_cb(gpointer data) if (!dw->idle_id) { - return FALSE; + return G_SOURCE_REMOVE; } if (!dw->setup_done) /* Clear on 1st entry */ @@ -2438,14 +2438,14 @@ static gboolean dupe_check_cb(gpointer data) { if (create_checksums_dimensions(dw, dw->list)) { - return TRUE; + return G_SOURCE_CONTINUE; } } if (dw->second_list) { if (create_checksums_dimensions(dw, dw->second_list)) { - return TRUE; + return G_SOURCE_CONTINUE; } } if ((dw->match_mask & DUPE_MATCH_SIM_HIGH || @@ -2472,7 +2472,7 @@ static gboolean dupe_check_cb(gpointer data) if (cache_sim_data_filled(di->simd)) { image_sim_alternate_processing(di->simd); - return TRUE; + return G_SOURCE_CONTINUE; } } @@ -2487,10 +2487,10 @@ static gboolean dupe_check_cb(gpointer data) di->simd = image_sim_new(); image_loader_free(dw->img_loader); dw->img_loader = NULL; - return TRUE; + return G_SOURCE_CONTINUE; } dw->idle_id = 0; - return FALSE; + return G_SOURCE_REMOVE; } dw->setup_point = dupe_setup_point_step(dw, dw->setup_point); @@ -2523,7 +2523,7 @@ static gboolean dupe_check_cb(gpointer data) { dupe_window_update_progress(dw, _("Comparing..."), 0.0, FALSE); - return TRUE; + return G_SOURCE_CONTINUE; } if (dw->search_matches_sorted == NULL) @@ -2547,7 +2547,7 @@ static gboolean dupe_check_cb(gpointer data) if (dw->search_matches_sorted != NULL) { - return TRUE; + return G_SOURCE_CONTINUE; } } g_list_free(dw->search_matches); @@ -2562,7 +2562,7 @@ static gboolean dupe_check_cb(gpointer data) { dw->setup_count = 0; dupe_window_update_progress(dw, _("Sorting..."), 1.0, TRUE); - return TRUE; + return G_SOURCE_CONTINUE; } } @@ -2579,7 +2579,7 @@ static gboolean dupe_check_cb(gpointer data) widget_set_cursor(dw->listview, -1); - return FALSE; + return G_SOURCE_REMOVE; /* The end */ } @@ -2607,7 +2607,7 @@ static gboolean dupe_check_cb(gpointer data) dupe_array_check(dw); } - return TRUE; + return G_SOURCE_CONTINUE; } static void dupe_check_start(DupeWindow *dw) diff --git a/src/histogram.cc b/src/histogram.cc index 02501048..38320892 100644 --- a/src/histogram.cc +++ b/src/histogram.cc @@ -212,9 +212,9 @@ static gboolean histmap_idle_cb(gpointer data) fd->histmap->pixbuf = NULL; fd->histmap->idle_id = 0; file_data_send_notification(fd, NOTIFY_HISTMAP); - return FALSE; + return G_SOURCE_REMOVE; } - return TRUE; + return G_SOURCE_CONTINUE; } gboolean histmap_start_idle(FileData *fd) diff --git a/src/image-load.cc b/src/image-load.cc index d8395cd1..5288ced7 100644 --- a/src/image-load.cc +++ b/src/image-load.cc @@ -294,28 +294,28 @@ static gboolean image_loader_emit_area_ready_cb(gpointer data) g_signal_emit(il, signals[SIGNAL_AREA_READY], 0, x, y, w, h); - return FALSE; + return G_SOURCE_REMOVE; } static gboolean image_loader_emit_done_cb(gpointer data) { ImageLoader *il = static_cast(data); g_signal_emit(il, signals[SIGNAL_DONE], 0); - return FALSE; + return G_SOURCE_REMOVE; } static gboolean image_loader_emit_error_cb(gpointer data) { ImageLoader *il = static_cast(data); g_signal_emit(il, signals[SIGNAL_ERROR], 0); - return FALSE; + return G_SOURCE_REMOVE; } static gboolean image_loader_emit_percent_cb(gpointer data) { ImageLoader *il = static_cast(data); g_signal_emit(il, signals[SIGNAL_PERCENT], 0, image_loader_get_percent(il)); - return FALSE; + return G_SOURCE_REMOVE; } static gboolean image_loader_emit_size_cb(gpointer data) @@ -327,7 +327,7 @@ static gboolean image_loader_emit_size_cb(gpointer data) height = il->actual_height; g_mutex_unlock(il->data_mutex); g_signal_emit(il, signals[SIGNAL_SIZE], 0, width, height); - return FALSE; + return G_SOURCE_REMOVE; } @@ -836,7 +836,7 @@ static gboolean image_loader_continue(ImageLoader *il) gint b; gint c; - if (!il) return FALSE; + if (!il) return G_SOURCE_REMOVE; c = il->idle_read_loop_count ? il->idle_read_loop_count : 1; while (c > 0 && !image_loader_get_stopping(il)) @@ -846,13 +846,13 @@ static gboolean image_loader_continue(ImageLoader *il) if (b == 0) { image_loader_done(il); - return FALSE; + return G_SOURCE_REMOVE; } if (b < 0 || (b > 0 && !il->backend.write(il->loader, il->mapped_file + il->bytes_read, b, &il->error))) { image_loader_error(il); - return FALSE; + return G_SOURCE_REMOVE; } il->bytes_read += b; @@ -865,7 +865,7 @@ static gboolean image_loader_continue(ImageLoader *il) image_loader_emit_percent(il); } - return TRUE; + return G_SOURCE_CONTINUE; } static gboolean image_loader_begin(ImageLoader *il) @@ -1158,7 +1158,7 @@ void image_loader_delay_area_ready(ImageLoader *il, gboolean enable) static gboolean image_loader_idle_cb(gpointer data) { - gboolean ret = FALSE; + gboolean ret = G_SOURCE_REMOVE; ImageLoader *il = static_cast(data); if (il->idle_id) diff --git a/src/image-overlay.cc b/src/image-overlay.cc index 9f9c740f..10ed72fe 100644 --- a/src/image-overlay.cc +++ b/src/image-overlay.cc @@ -675,7 +675,7 @@ static gboolean image_osd_update_cb(gpointer data) osd->changed_states = IMAGE_STATE_NONE; osd->notify = static_cast(0); osd->idle_id = 0; - return FALSE; + return G_SOURCE_REMOVE; } static void image_osd_update_schedule(OverlayStateData *osd, gboolean force) diff --git a/src/layout-util.cc b/src/layout-util.cc index 94451a93..dfa538a6 100644 --- a/src/layout-util.cc +++ b/src/layout-util.cc @@ -3306,7 +3306,7 @@ static gboolean layout_editors_reload_idle_cb(gpointer UNUSED(data)) { DEBUG_1("%s layout_editors_reload_idle_cb: get_desktop_files", get_exec_time()); layout_editors_desktop_files = editor_get_desktop_files(); - return TRUE; + return G_SOURCE_CONTINUE; } editor_read_desktop_file(static_cast(layout_editors_desktop_files->data)); @@ -3335,9 +3335,9 @@ static gboolean layout_editors_reload_idle_cb(gpointer UNUSED(data)) DEBUG_1("%s layout_editors_reload_idle_cb: setup_editors done", get_exec_time()); layout_editors_reload_idle_id = -1; - return FALSE; + return G_SOURCE_REMOVE; } - return TRUE; + return G_SOURCE_CONTINUE; } void layout_editors_reload_start(void) diff --git a/src/layout.cc b/src/layout.cc index 40251cbc..034dcdf8 100644 --- a/src/layout.cc +++ b/src/layout.cc @@ -2549,7 +2549,7 @@ static gboolean move_window_to_workspace_cb(gpointer data) } } #endif - return FALSE; + return G_SOURCE_REMOVE; } LayoutWindow *layout_new_with_geometry(FileData *dir_fd, LayoutOptions *lop, diff --git a/src/pan-view/pan-view.cc b/src/pan-view/pan-view.cc index 439c335f..623024ea 100644 --- a/src/pan-view/pan-view.cc +++ b/src/pan-view/pan-view.cc @@ -1063,7 +1063,7 @@ static gint pan_layout_update_idle_cb(gpointer data) if (pw->cache_todo) { pan_window_message(pw, _("Reading image data...")); - return TRUE; + return G_SOURCE_CONTINUE; } } if (pw->cache_todo) @@ -1086,10 +1086,10 @@ static gint pan_layout_update_idle_cb(gpointer data) pw->cache_tick = 0; } - if (pan_cache_step(pw)) return TRUE; + if (pan_cache_step(pw)) return G_SOURCE_CONTINUE; pw->idle_id = 0; - return FALSE; + return G_SOURCE_REMOVE; } } @@ -1124,7 +1124,7 @@ static gint pan_layout_update_idle_cb(gpointer data) pan_window_message(pw, NULL); pw->idle_id = 0; - return FALSE; + return G_SOURCE_REMOVE; } static void pan_layout_update_idle(PanWindow *pw) diff --git a/src/preferences.cc b/src/preferences.cc index 67526a95..bce3d509 100644 --- a/src/preferences.cc +++ b/src/preferences.cc @@ -1367,7 +1367,7 @@ static gboolean filter_add_scroll(gpointer data) gtk_tree_path_free(path); g_list_free(list_cells); - return(FALSE); + return(G_SOURCE_REMOVE); } static void filter_add_cb(GtkWidget *UNUSED(widget), gpointer data) @@ -1412,7 +1412,7 @@ static gboolean filter_default_ok_scroll(GtkTreeView *data) gtk_tree_path_free(path); - return(FALSE); + return(G_SOURCE_REMOVE); } static void filter_default_ok_cb(GenericDialog *gd, gpointer UNUSED(data)) @@ -1733,7 +1733,7 @@ static gboolean accel_default_scroll(GtkTreeView *data) gtk_tree_path_free(path); - return(FALSE); + return(G_SOURCE_REMOVE); } static void accel_default_cb(GtkWidget *UNUSED(widget), gpointer data) @@ -3109,7 +3109,7 @@ static gboolean keywords_find_file(gpointer data) file_data_unref(fd); string_list_free(keywords); - return (TRUE); + return (G_SOURCE_CONTINUE); } else if (kfd->list_dir) { @@ -3122,12 +3122,12 @@ static gboolean keywords_find_file(gpointer data) file_data_unref(fd); - return TRUE; + return G_SOURCE_CONTINUE; } keywords_find_finish(kfd); - return FALSE; + return G_SOURCE_REMOVE; } static void keywords_find_start_cb(GenericDialog *UNUSED(fd), gpointer data) diff --git a/src/remote.cc b/src/remote.cc index b1e8948f..f7ffc293 100644 --- a/src/remote.cc +++ b/src/remote.cc @@ -469,7 +469,7 @@ static gboolean gr_close_window_cb(gpointer UNUSED(data)) layout_menu_close_cb(NULL, lw_id); - return FALSE; + return G_SOURCE_REMOVE; } static void gr_close_window(const gchar *UNUSED(text), GIOChannel *UNUSED(channel), gpointer UNUSED(data)) @@ -674,7 +674,7 @@ static gboolean gr_quit_idle_cb(gpointer UNUSED(data)) { exit_program(); - return FALSE; + return G_SOURCE_REMOVE; } static void gr_quit(const gchar *UNUSED(text), GIOChannel *UNUSED(channel), gpointer UNUSED(data)) @@ -1169,7 +1169,7 @@ static gboolean wait_cb(const gpointer data) gtk_window_move(GTK_WINDOW(lw_id->window), x, y); - return FALSE; + return G_SOURCE_REMOVE; } static void gr_geometry(const gchar *text, GIOChannel *UNUSED(channel), gpointer UNUSED(data)) diff --git a/src/renderer-tiles.cc b/src/renderer-tiles.cc index 168da6d6..49ca8e8c 100644 --- a/src/renderer-tiles.cc +++ b/src/renderer-tiles.cc @@ -1599,7 +1599,7 @@ static gboolean rt_queue_schedule_next_draw(RendererTiles *rt, gboolean force_se /* 2pass prio */ DEBUG_2("redraw priority: 2pass"); rt->draw_idle_id = g_idle_add_full(G_PRIORITY_DEFAULT_IDLE, rt_queue_draw_idle_cb, rt, NULL); - return FALSE; + return G_SOURCE_REMOVE; } if (visible_area == 0) @@ -1617,7 +1617,7 @@ static gboolean rt_queue_schedule_next_draw(RendererTiles *rt, gboolean force_se /* we have enough data for starting intensive redrawing */ DEBUG_2("redraw priority: high %.2f %%", percent); rt->draw_idle_id = g_idle_add_full(GDK_PRIORITY_REDRAW, rt_queue_draw_idle_cb, rt, NULL); - return FALSE; + return G_SOURCE_REMOVE; } if (percent < 1.0 || force_set) @@ -1625,12 +1625,12 @@ static gboolean rt_queue_schedule_next_draw(RendererTiles *rt, gboolean force_se /* queue is (almost) empty, wait 50 ms*/ DEBUG_2("redraw priority: wait %.2f %%", percent); rt->draw_idle_id = g_timeout_add_full(G_PRIORITY_DEFAULT_IDLE, 50, rt_queue_draw_idle_cb, rt, NULL); - return FALSE; + return G_SOURCE_REMOVE; } /* keep the same priority as before */ DEBUG_2("redraw priority: no change %.2f %%", percent); - return TRUE; + return G_SOURCE_CONTINUE; } @@ -1649,7 +1649,7 @@ static gboolean rt_queue_draw_idle_cb(gpointer data) pr_render_complete_signal(pr); rt->draw_idle_id = 0; - return FALSE; + return G_SOURCE_REMOVE; } if (rt->draw_queue) @@ -1721,7 +1721,7 @@ static gboolean rt_queue_draw_idle_cb(gpointer data) pr_render_complete_signal(pr); rt->draw_idle_id = 0; - return FALSE; + return G_SOURCE_REMOVE; } return rt_queue_schedule_next_draw(rt, FALSE); diff --git a/src/search-and-run.cc b/src/search-and-run.cc index 43e2aada..af5a7a35 100644 --- a/src/search-and-run.cc +++ b/src/search-and-run.cc @@ -179,7 +179,7 @@ static gboolean search_and_run_destroy(gpointer data) sar->lw->sar_window = NULL; gtk_widget_destroy(sar->window); - return TRUE; + return G_SOURCE_CONTINUE; } static gboolean entry_box_activate_cb(GtkWidget *UNUSED(widget), gpointer data) diff --git a/src/search.cc b/src/search.cc index c9298d71..a42a0f89 100644 --- a/src/search.cc +++ b/src/search.cc @@ -790,7 +790,7 @@ static gboolean search_result_update_idle_cb(gpointer data) search_status_update(sd); sd->update_idle_id = 0; - return FALSE; + return G_SOURCE_REMOVE; } static void search_result_update_idle_cancel(SearchData *sd) @@ -2457,9 +2457,9 @@ static gboolean search_step_cb(gpointer data) if (search_file_next(sd)) { sd->search_idle_id = 0; - return FALSE; + return G_SOURCE_REMOVE; } - return TRUE; + return G_SOURCE_CONTINUE; } if (!sd->search_file_list && !sd->search_folder_list) @@ -2469,7 +2469,7 @@ static gboolean search_step_cb(gpointer data) search_stop(sd); search_result_thumb_step(sd); - return FALSE; + return G_SOURCE_REMOVE; } fd = static_cast(sd->search_folder_list->data); @@ -2549,7 +2549,7 @@ static gboolean search_step_cb(gpointer data) file_data_unref(fd); } - return TRUE; + return G_SOURCE_CONTINUE; } static void search_similarity_load_done_cb(ImageLoader *UNUSED(il), gpointer data) diff --git a/src/thumb-standard.cc b/src/thumb-standard.cc index 65f038a5..e18eb000 100644 --- a/src/thumb-standard.cc +++ b/src/thumb-standard.cc @@ -990,7 +990,7 @@ static gboolean thumb_loader_std_thumb_file_validate_idle_cb(gpointer data) tv->idle_id = 0; thumb_loader_std_thumb_file_validate_finish(tv, FALSE); - return FALSE; + return G_SOURCE_REMOVE; } ThumbLoaderStd *thumb_loader_std_thumb_file_validate(const gchar *thumb_path, gint allowed_days, @@ -1174,7 +1174,7 @@ static gboolean thumb_std_maint_move_idle(gpointer UNUSED(data)) TMaintMove *tm; gchar *pathl; - if (!thumb_std_maint_move_list) return FALSE; + if (!thumb_std_maint_move_list) return G_SOURCE_REMOVE; tm = static_cast(thumb_std_maint_move_list->data); @@ -1189,7 +1189,7 @@ static gboolean thumb_std_maint_move_idle(gpointer UNUSED(data)) thumb_std_maint_move_step(tm); - return FALSE; + return G_SOURCE_REMOVE; } /* This will schedule a move of the thumbnail for source image to dest when idle. diff --git a/src/thumb.cc b/src/thumb.cc index fab80dc2..f32a0e93 100644 --- a/src/thumb.cc +++ b/src/thumb.cc @@ -274,7 +274,7 @@ static gboolean thumb_loader_done_delay_cb(gpointer data) if (tl->func_done) tl->func_done(tl, tl->data); - return FALSE; + return G_SOURCE_REMOVE; } static void thumb_loader_delay_done(ThumbLoader *tl) diff --git a/src/ui-tree-edit.cc b/src/ui-tree-edit.cc index 4ffad811..2895ebfa 100644 --- a/src/ui-tree-edit.cc +++ b/src/ui-tree-edit.cc @@ -173,7 +173,7 @@ static gboolean tree_edit_by_path_idle_cb(gpointer data) NULL, NULL, GDK_CURRENT_TIME); gdk_keyboard_grab(gtk_widget_get_window(ted->window), TRUE, GDK_CURRENT_TIME); - return FALSE; + return G_SOURCE_REMOVE; } gboolean tree_edit_by_path(GtkTreeView *tree, GtkTreePath *tpath, gint column, const gchar *text, diff --git a/src/ui-utildlg.cc b/src/ui-utildlg.cc index 731fd26d..fecf9f3a 100644 --- a/src/ui-utildlg.cc +++ b/src/ui-utildlg.cc @@ -550,7 +550,7 @@ static gboolean appimage_notification_close_cb(gpointer data) g_thread_pool_free(appimage_data->thread_pool, TRUE, TRUE); g_free(appimage_data); - return FALSE; + return G_SOURCE_REMOVE; } static gboolean appimage_notification_fade_cb(gpointer data) diff --git a/src/utilops.cc b/src/utilops.cc index a146fc79..27c2eecf 100644 --- a/src/utilops.cc +++ b/src/utilops.cc @@ -673,7 +673,7 @@ static gboolean file_util_perform_ci_internal(gpointer data) /* this is removed when ud is destroyed */ ud->perform_idle_id = g_idle_add(file_util_perform_ci_internal, ud); - return TRUE; + return G_SOURCE_CONTINUE; } g_assert(ud->flist); @@ -694,16 +694,16 @@ static gboolean file_util_perform_ci_internal(gpointer data) ret = file_util_perform_ci_cb(GINT_TO_POINTER(!last), status, single_entry, ud); g_list_free(single_entry); - if (ret == EDITOR_CB_SUSPEND || last) return FALSE; + if (ret == EDITOR_CB_SUSPEND || last) return G_SOURCE_REMOVE; if (ret == EDITOR_CB_SKIP) { file_util_perform_ci_cb(NULL, EDITOR_ERROR_SKIPPED, ud->flist, ud); - return FALSE; + return G_SOURCE_REMOVE; } } - return TRUE; + return G_SOURCE_CONTINUE; } static void file_util_perform_ci_dir(UtilityData *ud, gboolean internal, gboolean ext_result) @@ -1446,7 +1446,7 @@ static gboolean file_util_rename_idle_cb(gpointer data) file_util_rename_preview_update(ud); ud->update_idle_id = 0; - return FALSE; + return G_SOURCE_REMOVE; } static void file_util_rename_preview_order_cb(GtkTreeModel *UNUSED(treemodel), GtkTreePath *UNUSED(tpath), @@ -2953,7 +2953,7 @@ static gboolean file_util_write_metadata_first_after_done(gpointer data) g_free(dd->dest_path); g_free(dd->editor_key); g_free(dd); - return FALSE; + return G_SOURCE_REMOVE; } static void file_util_write_metadata_first_done(gboolean success, const gchar *UNUSED(done_path), gpointer data) diff --git a/src/view-dir.cc b/src/view-dir.cc index 8dc22f5b..10488197 100644 --- a/src/view-dir.cc +++ b/src/view-dir.cc @@ -1061,7 +1061,7 @@ static gboolean vd_auto_scroll_idle_cb(gpointer data) } vd->drop_scroll_id = 0; - return FALSE; + return G_SOURCE_REMOVE; } static gboolean vd_auto_scroll_notify_cb(GtkWidget *UNUSED(widget), gint UNUSED(x), gint UNUSED(y), gpointer data) diff --git a/src/view-file/view-file-list.cc b/src/view-file/view-file-list.cc index 439c75b1..73ceb5ac 100644 --- a/src/view-file/view-file-list.cc +++ b/src/view-file/view-file-list.cc @@ -740,7 +740,7 @@ static gboolean vflist_select_idle_cb(gpointer data) if (!vf->layout) { VFLIST(vf)->select_idle_id = 0; - return FALSE; + return G_SOURCE_REMOVE; } vf_send_update(vf); @@ -752,7 +752,7 @@ static gboolean vflist_select_idle_cb(gpointer data) } VFLIST(vf)->select_idle_id = 0; - return FALSE; + return G_SOURCE_REMOVE; } static void vflist_select_idle_cancel(ViewFile *vf) diff --git a/src/view-file/view-file.cc b/src/view-file/view-file.cc index 34e6f797..b97ac287 100644 --- a/src/view-file/view-file.cc +++ b/src/view-file/view-file.cc @@ -1558,17 +1558,17 @@ gboolean vf_stars_cb(gpointer data) if (vf_star_next(vf)) { - return TRUE; + return G_SOURCE_CONTINUE; } else { vf->stars_filedata = NULL; vf->stars_id = 0; - return FALSE; + return G_SOURCE_REMOVE; } } - return FALSE; + return G_SOURCE_REMOVE; } void vf_star_update(ViewFile *vf) @@ -1703,7 +1703,7 @@ static gboolean vf_refresh_idle_cb(gpointer data) vf_refresh(vf); vf->refresh_idle_id = 0; - return FALSE; + return G_SOURCE_REMOVE; } void vf_refresh_idle_cancel(ViewFile *vf) @@ -1806,7 +1806,7 @@ static gboolean vf_read_metadata_in_idle_cb(gpointer data) read_rating_data(fd); } fd->metadata_in_idle_loaded = TRUE; - return TRUE; + return G_SOURCE_CONTINUE; } work = work->next; } @@ -1814,7 +1814,7 @@ static gboolean vf_read_metadata_in_idle_cb(gpointer data) vf_thumb_status(vf, 0.0, NULL); vf->read_metadata_in_idle_id = 0; vf_refresh(vf); - return FALSE; + return G_SOURCE_REMOVE; } static void vf_read_metadata_in_idle_finished_cb(gpointer data) -- 2.20.1