Skip to content

Commit 6c3268c

Browse files
committed
shorten compile time check for signal handler return type
1 parent a4ffd6e commit 6c3268c

File tree

2 files changed

+2
-14
lines changed

2 files changed

+2
-14
lines changed

src/control/signal.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -395,7 +395,7 @@ void dt_control_signal_connect(const dt_control_signal_t *ctlsig, dt_signal_t si
395395
{
396396
_print_trace(signal, DT_DEBUG_SIGNAL_ACT_CONNECT, "connect");
397397

398-
g_signal_connect(G_OBJECT(ctlsig->sink), _signal_description[signal].name, G_CALLBACK(cb), user_data);
398+
g_signal_connect_data(G_OBJECT(ctlsig->sink), _signal_description[signal].name, G_CALLBACK(cb), user_data, NULL, 0);
399399
}
400400

401401
void dt_control_signal_disconnect(const struct dt_control_signal_t *ctlsig, GCallback cb, gpointer user_data)

src/gui/gtk.h

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -646,22 +646,10 @@ static inline GCallback G_CALLBACK(void *f) { return (GCallback)f; } // as a mac
646646
#undef _Static_assert
647647
#undef g_signal_connect
648648
#define g_signal_connect(instance, signal, c_handler, user_data) do { \
649-
_Static_assert((FALSE \
650-
BOOLSIGNAL(signal, button-press-event) \
651-
BOOLSIGNAL(signal, button-release-event) \
652-
BOOLSIGNAL(signal, motion-notify-event) \
653-
BOOLSIGNAL(signal, enter-notify-event) \
654-
BOOLSIGNAL(signal, leave-notify-event) \
655-
BOOLSIGNAL(signal, key-press-event) \
656-
BOOLSIGNAL(signal, configure-event) \
657-
BOOLSIGNAL(signal, focus-out-event) \
658-
BOOLSIGNAL(signal, focus-in-event) \
659-
BOOLSIGNAL(signal, scroll-event) \
660-
BOOLSIGNAL(signal, delete-event) \
649+
_Static_assert(((strlen(signal)>4 && !strcmp("event", &signal[strlen(signal)-5])) \
661650
BOOLSIGNAL(signal, drag-motion) \
662651
BOOLSIGNAL(signal, drag-failed) \
663652
BOOLSIGNAL(signal, drag-drop) \
664-
BOOLSIGNAL(signal, event) \
665653
BOOLSIGNAL(signal, focus) \
666654
BOOLSIGNAL(signal, draw) \
667655
BOOLSIGNAL(signal, popup-menu) \

0 commit comments

Comments
 (0)