summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCyrille Bagard <nocbos@gmail.com>2016-04-27 22:40:44 (GMT)
committerCyrille Bagard <nocbos@gmail.com>2016-04-27 22:40:44 (GMT)
commit22804bd41734e57a4ee3079d17ecaed4c19dc6a4 (patch)
tree1dcdd56078e051b425ab7596081d88401fdf5d5c
parent8a09e4163c79541f0af78719d0cd85b85650c4b4 (diff)
Used official closures instead of user-defined ones when possible.
-rw-r--r--ChangeLog7
-rw-r--r--configure.ac2
-rw-r--r--src/glibext/gcodebuffer.c2
-rw-r--r--src/gtkext/gtkdockstation.c6
4 files changed, 12 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index a582a5a..e7df32e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
16-04-28 Cyrille Bagard <nocbos@gmail.com>
+ * configure.ac:
+ * src/glibext/gcodebuffer.c:
+ * src/gtkext/gtkdockstation.c:
+ Use official closures instead of user-defined ones when possible.
+
+16-04-28 Cyrille Bagard <nocbos@gmail.com>
+
* tools/d2c/Makefile.am:
* tools/d2c/args/Makefile.am:
* tools/d2c/bits/Makefile.am:
diff --git a/configure.ac b/configure.ac
index e326fe8..dc1118a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -288,7 +288,7 @@ AC_SUBST(LIBPYGOBJECT_LIBS)
AC_CONFIG_FILES([stamp-h po/Makefile.in], [echo timestamp > stamp-h])
-AC_CONFIG_COMMANDS([marshal], [echo -e "VOID:UINT64\nVOID:UINT64,UINT64\nVOID:INT,UINT64,INT\nVOID:OBJECT\nVOID:OBJECT,OBJECT\nVOID:ENUM,OBJECT\nVOID:ENUM,ENUM" > src/glibext/chrysamarshal.list])
+AC_CONFIG_COMMANDS([marshal], [echo -e "VOID:UINT64\nVOID:UINT64,UINT64\nVOID:INT,UINT64,INT\nVOID:OBJECT,OBJECT\nVOID:ENUM,OBJECT\nVOID:ENUM,ENUM" > src/glibext/chrysamarshal.list])
AC_CONFIG_FILES([Makefile
pixmaps/Makefile
diff --git a/src/glibext/gcodebuffer.c b/src/glibext/gcodebuffer.c
index 8979d2f..346ce70 100644
--- a/src/glibext/gcodebuffer.c
+++ b/src/glibext/gcodebuffer.c
@@ -1796,7 +1796,7 @@ static void g_buffer_view_class_init(GBufferViewClass *class)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET(GBufferViewClass, need_redraw),
NULL, NULL,
- g_cclosure_user_marshal_VOID__OBJECT,
+ g_cclosure_marshal_VOID__OBJECT,
G_TYPE_NONE, 0);
}
diff --git a/src/gtkext/gtkdockstation.c b/src/gtkext/gtkdockstation.c
index 1672d5e..2061a4b 100644
--- a/src/gtkext/gtkdockstation.c
+++ b/src/gtkext/gtkdockstation.c
@@ -84,7 +84,7 @@ static void gtk_dock_station_class_init(GtkDockStationClass *class)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET(GtkDockStationClass, dock_widget),
NULL, NULL,
- g_cclosure_user_marshal_VOID__OBJECT,
+ g_cclosure_marshal_VOID__OBJECT,
G_TYPE_NONE, 1, GTK_TYPE_WIDGET);
g_signal_new("undock-widget",
@@ -92,7 +92,7 @@ static void gtk_dock_station_class_init(GtkDockStationClass *class)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET(GtkDockStationClass, undock_widget),
NULL, NULL,
- g_cclosure_user_marshal_VOID__OBJECT,
+ g_cclosure_marshal_VOID__OBJECT,
G_TYPE_NONE, 1, GTK_TYPE_WIDGET);
g_signal_new("switch-widget",
@@ -100,7 +100,7 @@ static void gtk_dock_station_class_init(GtkDockStationClass *class)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET(GtkDockStationClass, switch_widget),
NULL, NULL,
- g_cclosure_user_marshal_VOID__OBJECT,
+ g_cclosure_marshal_VOID__OBJECT,
G_TYPE_NONE, 1, GTK_TYPE_WIDGET);
g_signal_new("menu-requested",