summary refs log tree commit diff stats
path: root/src/common/dbus/example.c
diff options
context:
space:
mode:
authorTingPing <tingping@tingping.se>2014-02-05 20:42:48 -0500
committerTingPing <tingping@tingping.se>2014-02-06 20:17:08 -0500
commit34cf164aa28c45c15ecf39b855f2de833a9b7c2d (patch)
tree059c5235b0974f2b8bbd2a6d5188425e882e6fd6 /src/common/dbus/example.c
parent5f7321280e2dfaa097fbd4855b547069ee96edc2 (diff)
Use a single marshal file for entire project
Diffstat (limited to 'src/common/dbus/example.c')
-rw-r--r--src/common/dbus/example.c4
1 files changed, 2 insertions, 2 deletions
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);