Skip to content

Commit 703944c

Browse files
committed
fix all detected incorrect callback return types
1 parent 6c3268c commit 703944c

File tree

20 files changed

+78
-93
lines changed

20 files changed

+78
-93
lines changed

src/develop/blend_gui.c

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2007,13 +2007,8 @@ static void _blendif_hide_output_channels(GtkMenuItem *menuitem,
20072007
}
20082008

20092009
static void _blendif_options_callback(GtkButton *button,
2010-
GdkEventButton *event,
20112010
dt_iop_module_t *module)
20122011
{
2013-
if(event->button != 1
2014-
&& event->button != 2)
2015-
return;
2016-
20172012
const dt_iop_gui_blend_data_t *bd = module->blend_data;
20182013

20192014
if(!bd
@@ -3476,7 +3471,7 @@ void dt_iop_gui_init_blending(GtkWidget *iopw,
34763471
gtk_widget_set_tooltip_text(presets_button, _("blending options"));
34773472
if(bd->blendif_support)
34783473
{
3479-
g_signal_connect(G_OBJECT(presets_button), "button-press-event",
3474+
g_signal_connect(G_OBJECT(presets_button), "clicked",
34803475
G_CALLBACK(_blendif_options_callback), module);
34813476
}
34823477
else

src/develop/imageop.c

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -872,9 +872,8 @@ static gboolean _rename_module_key_press(GtkWidget *entry,
872872
return FALSE; /* event not handled */
873873
}
874874

875-
static gboolean _rename_module_resize(GtkWidget *entry,
876-
GdkEventKey *event,
877-
dt_iop_module_t *module)
875+
static void _rename_module_resize(GtkWidget *entry,
876+
gpointer user)
878877
{
879878
int width = 0;
880879
GtkBorder padding;
@@ -884,8 +883,6 @@ static gboolean _rename_module_resize(GtkWidget *entry,
884883
gtk_widget_get_state_flags (entry),
885884
&padding);
886885
gtk_widget_set_size_request(entry, width + padding.left + padding.right + 1, -1);
887-
888-
return TRUE;
889886
}
890887

891888
void dt_iop_gui_rename_module(dt_iop_module_t *module)
@@ -3005,7 +3002,7 @@ GtkWidget *dt_iop_gui_header_button(dt_iop_module_t *module,
30053002
g_signal_connect(button, "enter-notify-event",
30063003
G_CALLBACK(_header_enter_notify_callback),
30073004
GINT_TO_POINTER(element));
3008-
g_signal_connect(button, "button-press-event", G_CALLBACK(callback), module);
3005+
g_signal_connect_data(button, "button-press-event", G_CALLBACK(callback), module, NULL, 0);
30093006
dt_action_define(&module->so->actions, NULL, NULL, button, NULL);
30103007
gtk_widget_show(button);
30113008

src/gui/gtk.c

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -752,10 +752,10 @@ static gboolean _borders_scrolled(GtkWidget *widget,
752752
return TRUE;
753753
}
754754

755-
static gboolean _scrollbar_changed(GtkWidget *widget,
756-
gpointer user_data)
755+
static void _scrollbar_changed(GtkWidget *widget,
756+
gpointer user_data)
757757
{
758-
if(darktable.gui->reset) return FALSE;
758+
if(darktable.gui->reset) return;
759759

760760
GtkAdjustment *adjustment_x =
761761
gtk_range_get_adjustment(GTK_RANGE(darktable.gui->scrollbars.hscrollbar));
@@ -766,8 +766,6 @@ static gboolean _scrollbar_changed(GtkWidget *widget,
766766
const gdouble value_y = gtk_adjustment_get_value(adjustment_y);
767767

768768
dt_view_manager_scrollbar_changed(darktable.view_manager, value_x, value_y);
769-
770-
return TRUE;
771769
}
772770

773771
gboolean _valid_window_placement(const gint saved_x,

src/iop/channelmixerrgb.c

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2874,7 +2874,6 @@ static void _start_profiling_callback(GtkWidget *togglebutton, dt_iop_module_t *
28742874
}
28752875

28762876
static void _run_profile_callback(GtkWidget *widget,
2877-
GdkEventButton *event,
28782877
dt_iop_module_t *self)
28792878
{
28802879
if(darktable.gui->reset) return;
@@ -2888,7 +2887,6 @@ static void _run_profile_callback(GtkWidget *widget,
28882887
}
28892888

28902889
static void _run_validation_callback(GtkWidget *widget,
2891-
GdkEventButton *event,
28922890
dt_iop_module_t *self)
28932891
{
28942892
if(darktable.gui->reset) return;
@@ -2902,7 +2900,6 @@ static void _run_validation_callback(GtkWidget *widget,
29022900
}
29032901

29042902
static void _commit_profile_callback(GtkWidget *widget,
2905-
GdkEventButton *event,
29062903
dt_iop_module_t *self)
29072904
{
29082905
if(darktable.gui->reset) return;
@@ -4693,22 +4690,22 @@ void gui_init(dt_iop_module_t *self)
46934690
g->button_commit = dtgtk_button_new(dtgtk_cairo_paint_check_mark, 0, NULL);
46944691
dt_action_define_iop(self, N_("calibrate"), N_("accept"),
46954692
g->button_commit, &dt_action_def_button);
4696-
g_signal_connect(G_OBJECT(g->button_commit), "button-press-event",
4693+
g_signal_connect(G_OBJECT(g->button_commit), "clicked",
46974694
G_CALLBACK(_commit_profile_callback), (gpointer)self);
46984695
gtk_widget_set_tooltip_text(g->button_commit,
46994696
_("accept the computed profile and set it in the module"));
47004697

47014698
g->button_profile = dtgtk_button_new(dtgtk_cairo_paint_refresh, 0, NULL);
47024699
dt_action_define_iop(self, N_("calibrate"), N_("recompute"),
47034700
g->button_profile, &dt_action_def_button);
4704-
g_signal_connect(G_OBJECT(g->button_profile), "button-press-event",
4701+
g_signal_connect(G_OBJECT(g->button_profile), "clicked",
47054702
G_CALLBACK(_run_profile_callback), (gpointer)self);
47064703
gtk_widget_set_tooltip_text(g->button_profile, _("recompute the profile"));
47074704

47084705
g->button_validate = dtgtk_button_new(dtgtk_cairo_paint_softproof, 0, NULL);
47094706
dt_action_define_iop(self, N_("calibrate"), N_("validate"),
47104707
g->button_validate, &dt_action_def_button);
4711-
g_signal_connect(G_OBJECT(g->button_validate), "button-press-event",
4708+
g_signal_connect(G_OBJECT(g->button_validate), "clicked",
47124709
G_CALLBACK(_run_validation_callback), (gpointer)self);
47134710
gtk_widget_set_tooltip_text(g->button_validate, _("check the output delta E"));
47144711

src/iop/colorbalance.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1798,7 +1798,7 @@ static void _configure_slider_blocks(gpointer instance, dt_iop_module_t *self)
17981798
if(old_container) gtk_widget_show(new_container);
17991799
}
18001800

1801-
static void _cycle_layout_callback(GtkWidget *label, GdkEventButton *event, dt_iop_module_t *self)
1801+
static gboolean _cycle_layout_callback(GtkWidget *label, GdkEventButton *event, dt_iop_module_t *self)
18021802
{
18031803
gchar *layout = dt_conf_get_string("plugins/darkroom/colorbalance/layout");
18041804

@@ -1809,6 +1809,7 @@ static void _cycle_layout_callback(GtkWidget *label, GdkEventButton *event, dt_i
18091809
g_free(layout);
18101810

18111811
_configure_slider_blocks(NULL, self);
1812+
return TRUE;
18121813
}
18131814

18141815
#define HSL_CALLBACK(which) \

src/iop/colorequal.c

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2814,13 +2814,12 @@ static gboolean _area_button_release_callback(GtkWidget *widget,
28142814
return FALSE;
28152815
}
28162816

2817-
static gboolean _area_size_callback(GtkWidget *widget,
2818-
GdkEventButton *event,
2819-
const dt_iop_module_t *self)
2817+
static void _area_size_callback(GtkWidget *widget,
2818+
GdkRectangle *allocation,
2819+
const dt_iop_module_t *self)
28202820
{
28212821
dt_iop_colorequal_gui_data_t *g = self->gui_data;
28222822
g->gradients_cached = FALSE;
2823-
return FALSE;
28242823
}
28252824

28262825
void gui_changed(dt_iop_module_t *self, GtkWidget *w, void *previous)
@@ -3033,7 +3032,7 @@ void gui_init(dt_iop_module_t *self)
30333032
G_CALLBACK(_area_motion_notify_callback), self);
30343033
g_signal_connect(G_OBJECT(g->area), "scroll-event",
30353034
G_CALLBACK(_area_scrolled_callback), self);
3036-
g_signal_connect(G_OBJECT(g->area), "size_allocate",
3035+
g_signal_connect(G_OBJECT(g->area), "size-allocate",
30373036
G_CALLBACK(_area_size_callback), self);
30383037

30393038
GtkWidget *box = self->widget = dt_gui_vbox(g->notebook, g->area);

src/iop/lut3d.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1733,7 +1733,7 @@ void gui_init(dt_iop_module_t *self)
17331733
gtk_tree_view_append_column((GtkTreeView *)g->lutname, col);
17341734
GtkTreeSelection *selection = gtk_tree_view_get_selection((GtkTreeView *)g->lutname);
17351735
gtk_tree_selection_set_mode(selection, GTK_SELECTION_SINGLE);
1736-
g->lutname_handler_id = g_signal_connect(G_OBJECT(selection), "changed", G_CALLBACK(_lutname_callback), self);
1736+
g->lutname_handler_id = g_signal_connect_data(G_OBJECT(selection), "changed", G_CALLBACK(_lutname_callback), self, NULL, 0);
17371737
dt_gui_box_add(self->widget, g->lutwindow);
17381738

17391739
g_signal_connect(G_OBJECT(g->lutentry), "changed", G_CALLBACK(_entry_callback), self);

src/iop/overlay.c

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -734,9 +734,9 @@ void process(dt_iop_module_t *self,
734734
dt_free_align(buf);
735735
}
736736

737-
static void _draw_thumb(GtkWidget *area,
738-
cairo_t *crf,
739-
const dt_iop_module_t *self)
737+
static gboolean _draw_thumb(GtkWidget *area,
738+
cairo_t *crf,
739+
const dt_iop_module_t *self)
740740
{
741741
const dt_iop_overlay_gui_data_t *g = self->gui_data;
742742
const dt_iop_overlay_params_t *p = self->params;
@@ -807,6 +807,7 @@ static void _draw_thumb(GtkWidget *area,
807807
pango_font_description_free(desc);
808808
g_object_unref(layout);
809809
}
810+
return FALSE;
810811
}
811812

812813
static void _alignment_callback(const GtkWidget *tb, dt_iop_module_t *self)

src/iop/temperature.c

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2011,9 +2011,9 @@ static void _gui_sliders_update(dt_iop_module_t *self)
20112011
gtk_widget_set_visible(GTK_WIDGET(g->scale_y), (img->flags & DT_IMAGE_4BAYER));
20122012
}
20132013

2014-
static void temp_label_click(GtkWidget *label,
2015-
GdkEventButton *event,
2016-
dt_iop_module_t *self)
2014+
static gboolean temp_label_click(GtkWidget *label,
2015+
GdkEventButton *event,
2016+
dt_iop_module_t *self)
20172017
{
20182018
dt_iop_temperature_gui_data_t *g = self->gui_data;
20192019

@@ -2043,6 +2043,7 @@ static void temp_label_click(GtkWidget *label,
20432043
_color_temptint_sliders(self);
20442044
_color_rgb_sliders(self);
20452045
_color_finetuning_slider(self);
2046+
return TRUE;
20462047
}
20472048

20482049
static void _preference_changed(gpointer instance, dt_iop_module_t *self)

src/libs/duplicate.c

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -157,9 +157,9 @@ static void _lib_duplicate_delete(GtkButton *button, dt_lib_module_t *self)
157157
g_list_prepend(NULL, GINT_TO_POINTER(imgid)));
158158
}
159159

160-
static void _lib_duplicate_thumb_press_callback(GtkWidget *widget,
161-
GdkEventButton *event,
162-
dt_lib_module_t *self)
160+
static gboolean _lib_duplicate_thumb_press_callback(GtkWidget *widget,
161+
GdkEventButton *event,
162+
dt_lib_module_t *self)
163163
{
164164
dt_lib_duplicate_t *d = self->data;
165165
dt_thumbnail_t *thumb = (dt_thumbnail_t *)g_object_get_data(G_OBJECT(widget), "thumb");
@@ -178,16 +178,19 @@ static void _lib_duplicate_thumb_press_callback(GtkWidget *widget,
178178
DT_CONTROL_SIGNAL_RAISE(DT_SIGNAL_VIEWMANAGER_THUMBTABLE_ACTIVATE, imgid);
179179
}
180180
}
181+
return TRUE;
181182
}
182183

183-
static void _lib_duplicate_thumb_release_callback(GtkWidget *widget,
184-
GdkEventButton *event,
185-
dt_lib_module_t *self)
184+
static gboolean _lib_duplicate_thumb_release_callback(GtkWidget *widget,
185+
GdkEventButton *event,
186+
dt_lib_module_t *self)
186187
{
187188
dt_lib_duplicate_t *d = self->data;
188189

189190
d->imgid = NO_IMGID;
190191
dt_control_queue_redraw_center();
192+
193+
return TRUE;
191194
}
192195

193196
void view_leave(struct dt_lib_module_t *self,

0 commit comments

Comments
 (0)