Use GLib generic marshallers; stop generating our own marshallers

11 files changed, 10 insertions, 64 deletions

diff --git a/src/Makefile.am b/src/Makefile.am
index 3fea9215..a376ae13 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,7 +1,4 @@
 BUILT_SOURCES = \
-    signals-marshal.list \
-    signals-marshal.h \
-    signals-marshal.c \
     enumtypes.h \
     enumtypes.c
 
@@ -266,37 +263,6 @@ $(top_builddir)/lib/gibber/libgibber.la:
 
 .PHONY: $(top_builddir)/lib/gibber/libgibber.la
 
-SIGNAL_MARSHAL_SOURCES = \
-    $(CORE_SOURCES) \
-    $(DUMMY_BACKEND_SOURCES)
-
-if USE_BACKEND_AVAHI
-  SIGNAL_MARSHAL_SOURCES += $(AVAHI_BACKEND_SOURCES)
-endif
-
-if USE_BACKEND_BONJOUR
-    SIGNAL_MARSHAL_SOURCES += $(BONJOUR_BACKEND_SOURCES)
-endif
-
-signals-marshal.list: $(SIGNAL_Marshal_SOURCES) Makefile.am
-	$(AM_V_GEN)( cd $(srcdir) && \
-	sed -n -e 's/.*salut_signals_marshal_\([[:upper:][:digit:]]*__[[:upper:][:digit:]_]*\).*/\1/p' \
-	$(SIGNAL_MARSHAL_SOURCES) ) \
-	| sed -e 's/__/:/' -e 'y/_/,/' | sort -u > $@.tmp
-	if cmp -s $@.tmp $@; then \
-		rm $@.tmp; \
-	else \
-		mv $@.tmp $@; \
-	fi
-
-signals-marshal.h: signals-marshal.list Makefile.am
-	$(AM_V_GEN)glib-genmarshal --header --prefix=salut_signals_marshal $< > $@
-
-signals-marshal.c: signals-marshal.list Makefile.am
-	$(AM_V_GEN){ echo '#include "signals-marshal.h"' && \
-	glib-genmarshal --body --prefix=salut_signals_marshal $< ; \
-	} > $@
-
 # rules for making the glib enum objects
 enumtype_sources = \
     $(top_srcdir)/src/presence.h
diff --git a/src/avahi-discovery-client.c b/src/avahi-discovery-client.c
index b75172ab..31ee6056 100644
--- a/src/avahi-discovery-client.c
+++ b/src/avahi-discovery-client.c
@@ -45,7 +45,6 @@
 #endif
 
 #include "presence.h"
-#include "signals-marshal.h"
 
 static void
 discovery_client_init (gpointer g_iface, gpointer iface_data);
@@ -214,8 +213,7 @@ salut_avahi_discovery_client_class_init (
                   G_OBJECT_CLASS_TYPE (salut_avahi_discovery_client_class),
                   G_SIGNAL_RUN_LAST | G_SIGNAL_DETAILED,
                   0,
-                  NULL, NULL,
-                  salut_signals_marshal_VOID__UINT,
+                  NULL, NULL, NULL,
                   G_TYPE_NONE, 1, G_TYPE_UINT);
 }
 
diff --git a/src/bonjour-discovery-client.c b/src/bonjour-discovery-client.c
index fc9beaeb..1faf0a38 100644
--- a/src/bonjour-discovery-client.c
+++ b/src/bonjour-discovery-client.c
@@ -204,8 +204,7 @@ salut_bonjour_discovery_client_class_init (
                   G_OBJECT_CLASS_TYPE (salut_bonjour_discovery_client_class),
                   G_SIGNAL_RUN_LAST | G_SIGNAL_DETAILED,
                   0,
-                  NULL, NULL,
-                  salut_signals_marshal_VOID__UINT,
+                  NULL, NULL, NULL,
                   G_TYPE_NONE, 1, G_TYPE_UINT);
 }
 
diff --git a/src/contact-manager.c b/src/contact-manager.c
index 8aeac5b4..999b68a7 100644
--- a/src/contact-manager.c
+++ b/src/contact-manager.c
@@ -27,7 +27,6 @@
 
 #include "connection.h"
 #include "contact-manager.h"
-#include "signals-marshal.h"
 #include "contact.h"
 #include "enumtypes.h"
 
@@ -140,8 +139,7 @@ salut_contact_manager_class_init (SalutContactManagerClass *salut_contact_manage
       G_OBJECT_CLASS_TYPE(salut_contact_manager_class),
       G_SIGNAL_RUN_LAST,
       0,
-      NULL, NULL,
-      salut_signals_marshal_VOID__OBJECT_INT,
+      NULL, NULL, NULL,
       G_TYPE_NONE, 2,
       SALUT_TYPE_CONTACT,
       G_TYPE_INT);
diff --git a/src/contact.c b/src/contact.c
index 3dab6a2d..9a306d45 100644
--- a/src/contact.c
+++ b/src/contact.c
@@ -22,7 +22,6 @@
 #include <string.h>
 
 #include "contact.h"
-#include "signals-marshal.h"
 #include "presence.h"
 #include "presence-cache.h"
 #include "enumtypes.h"
diff --git a/src/file-transfer-channel.c b/src/file-transfer-channel.c
index 9afcce8b..25b77eaa 100644
--- a/src/file-transfer-channel.c
+++ b/src/file-transfer-channel.c
@@ -42,7 +42,6 @@
 #include "debug.h"
 
 #include "file-transfer-channel.h"
-#include "signals-marshal.h"
 
 #include "connection.h"
 #include "im-manager.h"
diff --git a/src/ft-manager.c b/src/ft-manager.c
index a345d45e..aafb194d 100644
--- a/src/ft-manager.c
+++ b/src/ft-manager.c
@@ -29,7 +29,6 @@
 #include <gibber/gibber-file-transfer.h>
 
 #include "ft-manager.h"
-#include "signals-marshal.h"
 
 #include <salut/caps-channel-manager.h>
 
diff --git a/src/olpc-activity-manager.c b/src/olpc-activity-manager.c
index 1ee3d87e..ca319f49 100644
--- a/src/olpc-activity-manager.c
+++ b/src/olpc-activity-manager.c
@@ -25,7 +25,6 @@
 #include "olpc-activity-manager.h"
 
 #include "connection.h"
-#include "signals-marshal.h"
 
 #define DEBUG_FLAG DEBUG_OLPC_ACTIVITY
 #include "debug.h"
@@ -140,8 +139,7 @@ salut_olpc_activity_manager_class_init (SalutOlpcActivityManagerClass *salut_olp
 
   signals[ACTIVITY_MODIFIED] = g_signal_new ("activity-modified",
       G_OBJECT_CLASS_TYPE (salut_olpc_activity_manager_class),
-      G_SIGNAL_RUN_LAST, 0, NULL, NULL,
-      salut_signals_marshal_VOID__OBJECT,
+      G_SIGNAL_RUN_LAST, 0, NULL, NULL, NULL,
       G_TYPE_NONE, 1, SALUT_TYPE_OLPC_ACTIVITY);
 }
 
diff --git a/src/olpc-activity.c b/src/olpc-activity.c
index dd2f48ae..2af6cb16 100644
--- a/src/olpc-activity.c
+++ b/src/olpc-activity.c
@@ -30,8 +30,6 @@
 #include "util.h"
 #include "namespaces.h"
 
-#include "signals-marshal.h"
-
 #define DEBUG_FLAG DEBUG_OLPC_ACTIVITY
 #include "debug.h"
 
@@ -170,14 +168,12 @@ salut_olpc_activity_class_init (SalutOlpcActivityClass *salut_olpc_activity_clas
 
   signals[MODIFIED] = g_signal_new ("modified",
       G_OBJECT_CLASS_TYPE (salut_olpc_activity_class),
-      G_SIGNAL_RUN_LAST, 0, NULL, NULL,
-      salut_signals_marshal_VOID__VOID,
+      G_SIGNAL_RUN_LAST, 0, NULL, NULL, NULL,
       G_TYPE_NONE, 0);
 
   signals[VALID] = g_signal_new ("valid",
       G_OBJECT_CLASS_TYPE (salut_olpc_activity_class),
-      G_SIGNAL_RUN_LAST, 0, NULL, NULL,
-      salut_signals_marshal_VOID__VOID,
+      G_SIGNAL_RUN_LAST, 0, NULL, NULL, NULL,
       G_TYPE_NONE, 0);
 }
 
diff --git a/src/presence-cache.c b/src/presence-cache.c
index db54cae6..36e645a4 100644
--- a/src/presence-cache.c
+++ b/src/presence-cache.c
@@ -37,7 +37,6 @@
 #include "debug.h"
 #include "caps-hash.h"
 #include "disco.h"
-#include "signals-marshal.h"
 
 G_DEFINE_TYPE (SalutPresenceCache, salut_presence_cache, G_TYPE_OBJECT);
 
diff --git a/src/tube-stream.c b/src/tube-stream.c
index ee501fe6..e872ea32 100644
--- a/src/tube-stream.c
+++ b/src/tube-stream.c
@@ -65,7 +65,6 @@
 #define DEBUG_FLAG DEBUG_TUBES
 
 #include "debug.h"
-#include "signals-marshal.h"
 #include "connection.h"
 #include "muc-tube-stream.h"
 #include "tube-iface.h"
@@ -1432,8 +1431,7 @@ salut_tube_stream_class_init (SalutTubeStreamClass *salut_tube_stream_class)
                   G_OBJECT_CLASS_TYPE (salut_tube_stream_class),
                   G_SIGNAL_RUN_LAST | G_SIGNAL_DETAILED,
                   0,
-                  NULL, NULL,
-                  salut_signals_marshal_VOID__VOID,
+                  NULL, NULL, NULL,
                   G_TYPE_NONE, 0);
 
   signals[NEW_CONNECTION] =
@@ -1441,8 +1439,7 @@ salut_tube_stream_class_init (SalutTubeStreamClass *salut_tube_stream_class)
                   G_OBJECT_CLASS_TYPE (salut_tube_stream_class),
                   G_SIGNAL_RUN_LAST | G_SIGNAL_DETAILED,
                   0,
-                  NULL, NULL,
-                  salut_signals_marshal_VOID__UINT,
+                  NULL, NULL, NULL,
                   G_TYPE_NONE, 1, G_TYPE_UINT);
 
   signals[CLOSED] =
@@ -1450,8 +1447,7 @@ salut_tube_stream_class_init (SalutTubeStreamClass *salut_tube_stream_class)
                   G_OBJECT_CLASS_TYPE (salut_tube_stream_class),
                   G_SIGNAL_RUN_LAST | G_SIGNAL_DETAILED,
                   0,
-                  NULL, NULL,
-                  salut_signals_marshal_VOID__VOID,
+                  NULL, NULL, NULL,
                   G_TYPE_NONE, 0);
 
   signals[OFFERED] =
@@ -1459,8 +1455,7 @@ salut_tube_stream_class_init (SalutTubeStreamClass *salut_tube_stream_class)
                   G_OBJECT_CLASS_TYPE (salut_tube_stream_class),
                   G_SIGNAL_RUN_LAST | G_SIGNAL_DETAILED,
                   0,
-                  NULL, NULL,
-                  salut_signals_marshal_VOID__VOID,
+                  NULL, NULL, NULL,
                   G_TYPE_NONE, 0);
 
   salut_tube_stream_class->dbus_props_class.interfaces = prop_interfaces;