procyberian/emacs
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Port to GTK with strict C11 compiler

Browse source 
* src/gtkutil.c (xg_create_frame_widgets, xg_toggle_notify_cb):
Cast from function type to void * where the C standard requires this.
This works around a problem in the prototypes for
g_signal_handler_find and g_signal_handlers_block_by_func, which
use gpointer instead of GCallback.  Found by using gcc -pedantic.
This commit is contained in:
Paul Eggert 2016-03-18 08:36:59 -07:00
parent 658aa2dae8
commit de7601f149
1 changed files with 4 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/gtkutil.c
View file

@ -1300,7 +1300,7 @@ xg_create_frame_widgets (struct frame *f)
if (! g_signal_handler_find (G_OBJECT (gs), if (! g_signal_handler_find (G_OBJECT (gs),
G_SIGNAL_MATCH_FUNC, G_SIGNAL_MATCH_FUNC,
0, 0, 0, 0, 0, 0,
G_CALLBACK (style_changed_cb), (gpointer) G_CALLBACK (style_changed_cb),
0)) 0))
{ {
g_signal_connect (G_OBJECT (gs), "notify::gtk-theme-name", g_signal_connect (G_OBJECT (gs), "notify::gtk-theme-name",
@ -1832,14 +1832,10 @@ xg_toggle_notify_cb (GObject *gobject, GParamSpec *arg1, gpointer user_data)
if (!!visible != !!toggle_on) if (!!visible != !!toggle_on)
{ {
g_signal_handlers_block_by_func (G_OBJECT (wtoggle), gpointer cb = (gpointer) G_CALLBACK (xg_toggle_visibility_cb);
G_CALLBACK (xg_toggle_visibility_cb), g_signal_handlers_block_by_func (G_OBJECT (wtoggle), cb, gobject);
gobject);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (wtoggle), visible); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (wtoggle), visible);
g_signal_handlers_unblock_by_func g_signal_handlers_unblock_by_func (G_OBJECT (wtoggle), cb, gobject);
(G_OBJECT (wtoggle),
G_CALLBACK (xg_toggle_visibility_cb),
gobject);
} }
x_gtk_show_hidden_files = visible; x_gtk_show_hidden_files = visible;
} }