summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CMakeLists.txt2
-rw-r--r--liblogdiag/ld-canvas.c2
-rw-r--r--liblogdiag/ld-library-toolbar.c6
-rw-r--r--liblogdiag/ld-marshal.c24
-rw-r--r--liblogdiag/ld-marshal.h30
5 files changed, 32 insertions, 32 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5e7bc77..0169eee 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -201,7 +201,7 @@ function (glib_genmarshal base prefix)
endfunction (glib_genmarshal)
glib_genmarshal (${CMAKE_CURRENT_SOURCE_DIR}/liblogdiag/ld-marshal
- g_cclosure_user_marshal)
+ ld_marshal)
include_directories (${CMAKE_CURRENT_SOURCE_DIR})
include_directories (${GTK2_INCLUDE_DIRS}
diff --git a/liblogdiag/ld-canvas.c b/liblogdiag/ld-canvas.c
index 4699a05..0e1a508 100644
--- a/liblogdiag/ld-canvas.c
+++ b/liblogdiag/ld-canvas.c
@@ -295,7 +295,7 @@ ld_canvas_class_init (LdCanvasClass *klass)
G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
G_STRUCT_OFFSET (LdCanvasClass, set_scroll_adjustments),
NULL, NULL,
- g_cclosure_user_marshal_VOID__OBJECT_OBJECT,
+ ld_marshal_VOID__OBJECT_OBJECT,
G_TYPE_NONE, 2, GTK_TYPE_ADJUSTMENT, GTK_TYPE_ADJUSTMENT);
/**
diff --git a/liblogdiag/ld-library-toolbar.c b/liblogdiag/ld-library-toolbar.c
index c809f1e..7ee983a 100644
--- a/liblogdiag/ld-library-toolbar.c
+++ b/liblogdiag/ld-library-toolbar.c
@@ -166,7 +166,7 @@ ld_library_toolbar_class_init (LdLibraryToolbarClass *klass)
klass->symbol_chosen_signal = g_signal_new
("symbol-chosen", G_TYPE_FROM_CLASS (klass),
G_SIGNAL_RUN_LAST, 0, NULL, NULL,
- g_cclosure_user_marshal_VOID__OBJECT_STRING,
+ ld_marshal_VOID__OBJECT_STRING,
G_TYPE_NONE, 2, LD_TYPE_SYMBOL,
G_TYPE_STRING | G_SIGNAL_TYPE_STATIC_SCOPE);
@@ -181,7 +181,7 @@ ld_library_toolbar_class_init (LdLibraryToolbarClass *klass)
klass->symbol_selected_signal = g_signal_new
("symbol-selected", G_TYPE_FROM_CLASS (klass),
G_SIGNAL_RUN_LAST, 0, NULL, NULL,
- g_cclosure_user_marshal_VOID__OBJECT_STRING,
+ ld_marshal_VOID__OBJECT_STRING,
G_TYPE_NONE, 2, LD_TYPE_SYMBOL,
G_TYPE_STRING | G_SIGNAL_TYPE_STATIC_SCOPE);
@@ -196,7 +196,7 @@ ld_library_toolbar_class_init (LdLibraryToolbarClass *klass)
klass->symbol_deselected_signal = g_signal_new
("symbol-deselected", G_TYPE_FROM_CLASS (klass),
G_SIGNAL_RUN_LAST, 0, NULL, NULL,
- g_cclosure_user_marshal_VOID__OBJECT_STRING,
+ ld_marshal_VOID__OBJECT_STRING,
G_TYPE_NONE, 2, LD_TYPE_SYMBOL,
G_TYPE_STRING | G_SIGNAL_TYPE_STATIC_SCOPE);
diff --git a/liblogdiag/ld-marshal.c b/liblogdiag/ld-marshal.c
index 2eaa7b3..a086127 100644
--- a/liblogdiag/ld-marshal.c
+++ b/liblogdiag/ld-marshal.c
@@ -51,12 +51,12 @@
/* VOID:OBJECT,OBJECT (ld-marshal.list:1) */
void
-g_cclosure_user_marshal_VOID__OBJECT_OBJECT (GClosure *closure,
- GValue *return_value G_GNUC_UNUSED,
- guint n_param_values,
- const GValue *param_values,
- gpointer invocation_hint G_GNUC_UNUSED,
- gpointer marshal_data)
+ld_marshal_VOID__OBJECT_OBJECT (GClosure *closure,
+ GValue *return_value G_GNUC_UNUSED,
+ guint n_param_values,
+ const GValue *param_values,
+ gpointer invocation_hint G_GNUC_UNUSED,
+ gpointer marshal_data)
{
typedef void (*GMarshalFunc_VOID__OBJECT_OBJECT) (gpointer data1,
gpointer arg_1,
@@ -88,12 +88,12 @@ g_cclosure_user_marshal_VOID__OBJECT_OBJECT (GClosure *closure,
/* VOID:OBJECT,STRING (ld-marshal.list:2) */
void
-g_cclosure_user_marshal_VOID__OBJECT_STRING (GClosure *closure,
- GValue *return_value G_GNUC_UNUSED,
- guint n_param_values,
- const GValue *param_values,
- gpointer invocation_hint G_GNUC_UNUSED,
- gpointer marshal_data)
+ld_marshal_VOID__OBJECT_STRING (GClosure *closure,
+ GValue *return_value G_GNUC_UNUSED,
+ guint n_param_values,
+ const GValue *param_values,
+ gpointer invocation_hint G_GNUC_UNUSED,
+ gpointer marshal_data)
{
typedef void (*GMarshalFunc_VOID__OBJECT_STRING) (gpointer data1,
gpointer arg_1,
diff --git a/liblogdiag/ld-marshal.h b/liblogdiag/ld-marshal.h
index cdf28a7..c326e86 100644
--- a/liblogdiag/ld-marshal.h
+++ b/liblogdiag/ld-marshal.h
@@ -1,28 +1,28 @@
-#ifndef __g_cclosure_user_marshal_MARSHAL_H__
-#define __g_cclosure_user_marshal_MARSHAL_H__
+#ifndef __ld_marshal_MARSHAL_H__
+#define __ld_marshal_MARSHAL_H__
#include <glib-object.h>
G_BEGIN_DECLS
/* VOID:OBJECT,OBJECT (ld-marshal.list:1) */
-extern void g_cclosure_user_marshal_VOID__OBJECT_OBJECT (GClosure *closure,
- GValue *return_value,
- guint n_param_values,
- const GValue *param_values,
- gpointer invocation_hint,
- gpointer marshal_data);
+extern void ld_marshal_VOID__OBJECT_OBJECT (GClosure *closure,
+ GValue *return_value,
+ guint n_param_values,
+ const GValue *param_values,
+ gpointer invocation_hint,
+ gpointer marshal_data);
/* VOID:OBJECT,STRING (ld-marshal.list:2) */
-extern void g_cclosure_user_marshal_VOID__OBJECT_STRING (GClosure *closure,
- GValue *return_value,
- guint n_param_values,
- const GValue *param_values,
- gpointer invocation_hint,
- gpointer marshal_data);
+extern void ld_marshal_VOID__OBJECT_STRING (GClosure *closure,
+ GValue *return_value,
+ guint n_param_values,
+ const GValue *param_values,
+ gpointer invocation_hint,
+ gpointer marshal_data);
G_END_DECLS
-#endif /* __g_cclosure_user_marshal_MARSHAL_H__ */
+#endif /* __ld_marshal_MARSHAL_H__ */