diff options
| author | TingPing <tingping@tingping.se> | 2014-02-05 20:42:48 -0500 |
|---|---|---|
| committer | TingPing <tingping@tingping.se> | 2014-02-06 20:17:08 -0500 |
| commit | 34cf164aa28c45c15ecf39b855f2de833a9b7c2d (patch) | |
| tree | 059c5235b0974f2b8bbd2a6d5188425e882e6fd6 /src/common/dbus | |
| parent | 5f7321280e2dfaa097fbd4855b547069ee96edc2 (diff) | |
Use a single marshal file for entire project
Diffstat (limited to 'src/common/dbus')
| -rw-r--r-- | src/common/dbus/Makefile.am | 7 | ||||
| -rw-r--r-- | src/common/dbus/dbus-plugin.c | 8 | ||||
| -rw-r--r-- | src/common/dbus/example.c | 4 | ||||
| -rw-r--r-- | src/common/dbus/marshallers.list | 1 |
4 files changed, 7 insertions, 13 deletions
diff --git a/src/common/dbus/Makefile.am b/src/common/dbus/Makefile.am index bad6f611..4fa30452 100644 --- a/src/common/dbus/Makefile.am +++ b/src/common/dbus/Makefile.am @@ -7,12 +7,10 @@ libhexchatdbus_a_SOURCES = \ EXTRA_DIST = \ remote-object.xml \ - marshallers.list \ example.py \ org.hexchat.service.service.in BUILT_SOURCES = \ - marshallers.h \ remote-object-glue.h CLEANFILES = $(BUILT_SOURCES) @@ -20,15 +18,12 @@ CLEANFILES = $(BUILT_SOURCES) AM_CPPFLAGS = $(COMMON_CFLAGS) $(DBUS_CFLAGS) noinst_PROGRAMS = example -example_SOURCES = example.c +example_SOURCES = example.c example_LDADD = $(DBUS_LIBS) $(GLIB_LIBS) remote-object-glue.h: remote-object.xml $(AM_V_GEN) $(LIBTOOL) --mode=execute $(DBUS_BINDING_TOOL) --prefix=remote_object --mode=glib-server --output=$@ $< -marshallers.h: marshallers.list - $(AM_V_GEN) $(LIBTOOL) --mode=execute $(GLIB_GENMARSHAL) --header --body $< > $@ - # Dbus service file servicedir = $(DBUS_SERVICES_DIR) service_in_files = org.hexchat.service.service.in diff --git a/src/common/dbus/dbus-plugin.c b/src/common/dbus/dbus-plugin.c index 62b83bb1..ce079982 100644 --- a/src/common/dbus/dbus-plugin.c +++ b/src/common/dbus/dbus-plugin.c @@ -241,7 +241,7 @@ static gboolean remote_object_send_modes (RemoteObject *obj, GError **error); #include "remote-object-glue.h" -#include "marshallers.h" +#include "../marshal.h" /* Useful functions */ @@ -317,7 +317,7 @@ remote_object_class_init (RemoteObjectClass *klass) G_SIGNAL_RUN_LAST, 0, NULL, NULL, - g_cclosure_user_marshal_VOID__POINTER_POINTER_UINT_UINT, + _hexchat_marshal_VOID__POINTER_POINTER_UINT_UINT, G_TYPE_NONE, 4, G_TYPE_STRV, G_TYPE_STRV, G_TYPE_UINT, G_TYPE_UINT); @@ -327,7 +327,7 @@ remote_object_class_init (RemoteObjectClass *klass) G_SIGNAL_RUN_LAST, 0, NULL, NULL, - g_cclosure_user_marshal_VOID__POINTER_POINTER_UINT_UINT, + _hexchat_marshal_VOID__POINTER_POINTER_UINT_UINT, G_TYPE_NONE, 4, G_TYPE_STRV, G_TYPE_STRV, G_TYPE_UINT, G_TYPE_UINT); @@ -337,7 +337,7 @@ remote_object_class_init (RemoteObjectClass *klass) G_SIGNAL_RUN_LAST, 0, NULL, NULL, - g_cclosure_user_marshal_VOID__POINTER_POINTER_UINT_UINT, + _hexchat_marshal_VOID__POINTER_POINTER_UINT_UINT, G_TYPE_NONE, 3, G_TYPE_STRV, G_TYPE_UINT, G_TYPE_UINT); diff --git a/src/common/dbus/example.c b/src/common/dbus/example.c index ee1833d3..c3ad4ff3 100644 --- a/src/common/dbus/example.c +++ b/src/common/dbus/example.c @@ -22,7 +22,7 @@ #include <config.h> #include <dbus/dbus-glib.h> #include <stdlib.h> -#include "marshallers.h" +#include "../marshal.c" #define DBUS_SERVICE "org.hexchat.service" #define DBUS_REMOTE "/org/hexchat/Remote" @@ -159,7 +159,7 @@ main (int argc, char **argv) g_print ("Server hook id=%d\n", server_id); dbus_g_object_register_marshaller ( - g_cclosure_user_marshal_VOID__POINTER_POINTER_UINT_UINT, + _hexchat_marshal_VOID__POINTER_POINTER_UINT_UINT, G_TYPE_NONE, G_TYPE_STRV, G_TYPE_STRV, G_TYPE_UINT, G_TYPE_UINT, G_TYPE_INVALID); diff --git a/src/common/dbus/marshallers.list b/src/common/dbus/marshallers.list deleted file mode 100644 index bc3c4ad5..00000000 --- a/src/common/dbus/marshallers.list +++ /dev/null @@ -1 +0,0 @@ -VOID:POINTER,POINTER,UINT,UINT |