p
/
logdiag
1
1
Fork 0
Code Issues Pull Requests Releases 4 Wiki Activity

Rename g_cclosure_user_marshal_* to ld_marshal_*.

This commit is contained in:
Přemysl Eric Janouch 2011-01-24 17:18:28 +01:00
parent 33beece3ab
commit 5d766cba77
5 changed files with 32 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -201,7 +201,7 @@ function (glib_genmarshal base prefix)
endfunction (glib_genmarshal) endfunction (glib_genmarshal)
glib_genmarshal (${CMAKE_CURRENT_SOURCE_DIR}/liblogdiag/ld-marshal glib_genmarshal (${CMAKE_CURRENT_SOURCE_DIR}/liblogdiag/ld-marshal
g_cclosure_user_marshal) ld_marshal)
include_directories (${CMAKE_CURRENT_SOURCE_DIR}) include_directories (${CMAKE_CURRENT_SOURCE_DIR})
include_directories (${GTK2_INCLUDE_DIRS} include_directories (${GTK2_INCLUDE_DIRS}

2
liblogdiag/ld-canvas.c
View File

@ -295,7 +295,7 @@ ld_canvas_class_init (LdCanvasClass *klass)
G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
G_STRUCT_OFFSET (LdCanvasClass, set_scroll_adjustments), G_STRUCT_OFFSET (LdCanvasClass, set_scroll_adjustments),
NULL, NULL, NULL, NULL,
g_cclosure_user_marshal_VOID__OBJECT_OBJECT, ld_marshal_VOID__OBJECT_OBJECT,
G_TYPE_NONE, 2, GTK_TYPE_ADJUSTMENT, GTK_TYPE_ADJUSTMENT); G_TYPE_NONE, 2, GTK_TYPE_ADJUSTMENT, GTK_TYPE_ADJUSTMENT);
/** /**

6
liblogdiag/ld-library-toolbar.c
View File

@ -166,7 +166,7 @@ ld_library_toolbar_class_init (LdLibraryToolbarClass *klass)
klass->symbol_chosen_signal = g_signal_new klass->symbol_chosen_signal = g_signal_new
("symbol-chosen", G_TYPE_FROM_CLASS (klass), ("symbol-chosen", G_TYPE_FROM_CLASS (klass),
G_SIGNAL_RUN_LAST, 0, NULL, NULL, 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_NONE, 2, LD_TYPE_SYMBOL,
G_TYPE_STRING | G_SIGNAL_TYPE_STATIC_SCOPE); 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 klass->symbol_selected_signal = g_signal_new
("symbol-selected", G_TYPE_FROM_CLASS (klass), ("symbol-selected", G_TYPE_FROM_CLASS (klass),
G_SIGNAL_RUN_LAST, 0, NULL, NULL, 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_NONE, 2, LD_TYPE_SYMBOL,
G_TYPE_STRING | G_SIGNAL_TYPE_STATIC_SCOPE); 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 klass->symbol_deselected_signal = g_signal_new
("symbol-deselected", G_TYPE_FROM_CLASS (klass), ("symbol-deselected", G_TYPE_FROM_CLASS (klass),
G_SIGNAL_RUN_LAST, 0, NULL, NULL, 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_NONE, 2, LD_TYPE_SYMBOL,
G_TYPE_STRING | G_SIGNAL_TYPE_STATIC_SCOPE); G_TYPE_STRING | G_SIGNAL_TYPE_STATIC_SCOPE);

24
liblogdiag/ld-marshal.c
View File

@ -51,12 +51,12 @@
/* VOID:OBJECT,OBJECT (ld-marshal.list:1) */ /* VOID:OBJECT,OBJECT (ld-marshal.list:1) */
void void
g_cclosure_user_marshal_VOID__OBJECT_OBJECT (GClosure *closure, ld_marshal_VOID__OBJECT_OBJECT (GClosure *closure,
GValue *return_value G_GNUC_UNUSED, GValue *return_value G_GNUC_UNUSED,
guint n_param_values, guint n_param_values,
const GValue *param_values, const GValue *param_values,
gpointer invocation_hint G_GNUC_UNUSED, gpointer invocation_hint G_GNUC_UNUSED,
gpointer marshal_data) gpointer marshal_data)
{ {
typedef void (*GMarshalFunc_VOID__OBJECT_OBJECT) (gpointer data1, typedef void (*GMarshalFunc_VOID__OBJECT_OBJECT) (gpointer data1,
gpointer arg_1, gpointer arg_1,
@ -88,12 +88,12 @@ g_cclosure_user_marshal_VOID__OBJECT_OBJECT (GClosure *closure,
/* VOID:OBJECT,STRING (ld-marshal.list:2) */ /* VOID:OBJECT,STRING (ld-marshal.list:2) */
void void
g_cclosure_user_marshal_VOID__OBJECT_STRING (GClosure *closure, ld_marshal_VOID__OBJECT_STRING (GClosure *closure,
GValue *return_value G_GNUC_UNUSED, GValue *return_value G_GNUC_UNUSED,
guint n_param_values, guint n_param_values,
const GValue *param_values, const GValue *param_values,
gpointer invocation_hint G_GNUC_UNUSED, gpointer invocation_hint G_GNUC_UNUSED,
gpointer marshal_data) gpointer marshal_data)
{ {
typedef void (*GMarshalFunc_VOID__OBJECT_STRING) (gpointer data1, typedef void (*GMarshalFunc_VOID__OBJECT_STRING) (gpointer data1,
gpointer arg_1, gpointer arg_1,

30
liblogdiag/ld-marshal.h
View File

@ -1,28 +1,28 @@
#ifndef __g_cclosure_user_marshal_MARSHAL_H__ #ifndef __ld_marshal_MARSHAL_H__
#define __g_cclosure_user_marshal_MARSHAL_H__ #define __ld_marshal_MARSHAL_H__
#include <glib-object.h> #include <glib-object.h>
G_BEGIN_DECLS G_BEGIN_DECLS
/* VOID:OBJECT,OBJECT (ld-marshal.list:1) */ /* VOID:OBJECT,OBJECT (ld-marshal.list:1) */
extern void g_cclosure_user_marshal_VOID__OBJECT_OBJECT (GClosure *closure, extern void ld_marshal_VOID__OBJECT_OBJECT (GClosure *closure,
GValue *return_value, GValue *return_value,
guint n_param_values, guint n_param_values,
const GValue *param_values, const GValue *param_values,
gpointer invocation_hint, gpointer invocation_hint,
gpointer marshal_data); gpointer marshal_data);
/* VOID:OBJECT,STRING (ld-marshal.list:2) */ /* VOID:OBJECT,STRING (ld-marshal.list:2) */
extern void g_cclosure_user_marshal_VOID__OBJECT_STRING (GClosure *closure, extern void ld_marshal_VOID__OBJECT_STRING (GClosure *closure,
GValue *return_value, GValue *return_value,
guint n_param_values, guint n_param_values,
const GValue *param_values, const GValue *param_values,
gpointer invocation_hint, gpointer invocation_hint,
gpointer marshal_data); gpointer marshal_data);
G_END_DECLS G_END_DECLS
#endif /* __g_cclosure_user_marshal_MARSHAL_H__ */ #endif /* __ld_marshal_MARSHAL_H__ */