telepathy-mission-control: Use the GObject 2.30 generic marshaller
Simon McVittie
smcv at kemper.freedesktop.org
Thu May 10 08:15:14 PDT 2012
Module: telepathy-mission-control
Branch: master
Commit: 4850e3cd729f7a0c8c98e5c1452824abb7c776eb
URL: http://cgit.freedesktop.org/telepathy/telepathy-mission-control/commit/?id=4850e3cd729f7a0c8c98e5c1452824abb7c776eb
Author: Simon McVittie <simon.mcvittie at collabora.co.uk>
Date: Tue May 8 12:54:21 2012 +0100
Use the GObject 2.30 generic marshaller
---
src/Makefile.am | 11 -----------
src/mcd-account-priv.h | 1 -
src/mcd-account.c | 3 +--
src/mcd-connection.c | 6 ++----
src/mcd-dispatcher.c | 1 -
src/mcd-service.c | 1 -
src/mcd-signals-marshal.list | 19 -------------------
src/mcd-slacker.c | 4 +---
src/mcd-transport.c | 4 +---
9 files changed, 5 insertions(+), 45 deletions(-)
diff --git a/src/Makefile.am b/src/Makefile.am
index 9f9f06a..6038e25 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -85,8 +85,6 @@ nodist_libmcd_convenience_la_SOURCES = \
_gen/svc-dispatcher.c \
mcd-enum-types.c \
mcd-enum-types.h \
- mcd-signals-marshal.c \
- mcd-signals-marshal.h \
$(mc_gen_headers)
BUILT_SOURCES = \
@@ -240,14 +238,6 @@ endif
endif
-%-signals-marshal.h: %-signals-marshal.list Makefile
- $(AM_V_GEN)glib-genmarshal --header --prefix=_$(subst -,_,$*)_marshal $< > $*-signals-marshal.h
-
-%-signals-marshal.c: %-signals-marshal.list Makefile
- $(AM_V_GEN){ echo '#include "$*-signals-marshal.h"' && \
- glib-genmarshal --body --prefix=_$(subst -,_,$*)_marshal $<; } \
- > $*-signals-marshal.c
-
mcd-enum-types.h: stamp-mcd-enum-types.h
$(AM_V_GEN)true
stamp-mcd-enum-types.h: Makefile $(mc_headers) mcd-enum-types.c
@@ -276,7 +266,6 @@ mcd-enum-types.c: Makefile $(mc_headers)
EXTRA_DIST = \
mcd.xml \
dispatcher.xml \
- mcd-signals-marshal.list \
stamp-mcd-enum-types.h
Android.mk: Makefile.am $(nodist_libmcd_convenience_la_SOURCES)
diff --git a/src/mcd-account-priv.h b/src/mcd-account-priv.h
index 624227a..719ae6d 100644
--- a/src/mcd-account-priv.h
+++ b/src/mcd-account-priv.h
@@ -34,7 +34,6 @@
#include "request.h"
#include <telepathy-glib/proxy-subclass.h>
-#include "mcd-signals-marshal.h"
/* auto-generated stubs */
#include "_gen/svc-Account_Interface_Addressing.h"
diff --git a/src/mcd-account.c b/src/mcd-account.c
index f9ac247..6521e17 100644
--- a/src/mcd-account.c
+++ b/src/mcd-account.c
@@ -44,7 +44,6 @@
#include "mcd-connection-plugin.h"
#include "mcd-connection-priv.h"
#include "mcd-misc.h"
-#include "mcd-signals-marshal.h"
#include "mcd-manager.h"
#include "mcd-manager-priv.h"
#include "mcd-master.h"
@@ -3131,7 +3130,7 @@ mcd_account_class_init (McdAccountClass * klass)
G_OBJECT_CLASS_TYPE (klass),
G_SIGNAL_RUN_LAST | G_SIGNAL_DETAILED,
0,
- NULL, NULL, _mcd_marshal_VOID__UINT_UINT,
+ NULL, NULL, NULL,
G_TYPE_NONE,
2, G_TYPE_UINT, G_TYPE_UINT);
_mcd_account_signals[VALIDITY_CHANGED] =
diff --git a/src/mcd-connection.c b/src/mcd-connection.c
index 24f945d..c06bee2 100644
--- a/src/mcd-connection.c
+++ b/src/mcd-connection.c
@@ -64,8 +64,6 @@
#include "mcd-slacker.h"
#include "sp_timestamp.h"
-#include "mcd-signals-marshal.h"
-
#define INITIAL_RECONNECTION_TIME 3 /* seconds */
#define RECONNECTION_MULTIPLIER 3
#define MAXIMUM_RECONNECTION_TIME 30 * 60 /* half an hour */
@@ -2384,7 +2382,7 @@ mcd_connection_class_init (McdConnectionClass * klass)
signals[SELF_PRESENCE_CHANGED] = g_signal_new ("self-presence-changed",
G_OBJECT_CLASS_TYPE (klass),
G_SIGNAL_RUN_LAST | G_SIGNAL_DETAILED, 0,
- NULL, NULL, _mcd_marshal_VOID__UINT_STRING_STRING,
+ NULL, NULL, NULL,
G_TYPE_NONE, 3, G_TYPE_UINT, G_TYPE_STRING, G_TYPE_STRING);
signals[SELF_NICKNAME_CHANGED] = g_signal_new ("self-nickname-changed",
@@ -2396,7 +2394,7 @@ mcd_connection_class_init (McdConnectionClass * klass)
signals[CONNECTION_STATUS_CHANGED] = g_signal_new (
"connection-status-changed", G_OBJECT_CLASS_TYPE (klass),
G_SIGNAL_RUN_LAST | G_SIGNAL_DETAILED, 0,
- NULL, NULL, _mcd_marshal_VOID__UINT_UINT_OBJECT,
+ NULL, NULL, NULL,
G_TYPE_NONE, 3, G_TYPE_UINT, G_TYPE_UINT, TP_TYPE_CONNECTION);
signals[READY] = g_signal_new ("ready",
diff --git a/src/mcd-dispatcher.c b/src/mcd-dispatcher.c
index 6fcffb4..3e7216a 100644
--- a/src/mcd-dispatcher.c
+++ b/src/mcd-dispatcher.c
@@ -44,7 +44,6 @@
#include "mission-control-plugins/mission-control-plugins.h"
#include "client-registry.h"
-#include "mcd-signals-marshal.h"
#include "mcd-account-priv.h"
#include "mcd-client-priv.h"
#include "mcd-connection.h"
diff --git a/src/mcd-service.c b/src/mcd-service.c
index 71e9dfc..09f551a 100644
--- a/src/mcd-service.c
+++ b/src/mcd-service.c
@@ -50,7 +50,6 @@
#include <dbus/dbus.h>
#include <telepathy-glib/telepathy-glib.h>
-#include "mcd-signals-marshal.h"
#include "mcd-dispatcher.h"
#include "mcd-dispatcher-context.h"
#include "mcd-connection.h"
diff --git a/src/mcd-signals-marshal.list b/src/mcd-signals-marshal.list
deleted file mode 100644
index 2fdd572..0000000
--- a/src/mcd-signals-marshal.list
+++ /dev/null
@@ -1,19 +0,0 @@
-VOID:UINT,UINT,UINT,STRING
-VOID:UINT,STRING,UINT
-VOID:STRING,UINT
-VOID:UINT,STRING
-VOID:UINT,UINT
-VOID:UINT,UINT,OBJECT
-VOID:OBJECT,ENUM,STRING
-VOID:ENUM,STRING
-VOID:OBJECT,ENUM,ENUM
-VOID:INT,STRING
-VOID:OBJECT,INT,STRING
-VOID:OBJECT,INT,INT
-VOID:OBJECT,POINTER
-VOID:UINT,BOOLEAN
-VOID:UINT,STRING,STRING
-VOID:BOXED,STRING
-VOID:POINTER,UINT
-VOID:UINT,BOXED
-VOID:BOOLEAN
diff --git a/src/mcd-slacker.c b/src/mcd-slacker.c
index b3ffbef..e0c8b0e 100644
--- a/src/mcd-slacker.c
+++ b/src/mcd-slacker.c
@@ -52,7 +52,6 @@
#endif /* HAVE_MCE */
#include "mcd-debug.h"
-#include "mcd-signals-marshal.h"
struct _McdSlackerPrivate {
DBusGConnection *bus;
@@ -293,8 +292,7 @@ mcd_slacker_class_init (McdSlackerClass *klass)
*/
signals[SIG_INACTIVITY_CHANGED] = g_signal_new ("inactivity-changed",
MCD_TYPE_SLACKER, G_SIGNAL_RUN_LAST, 0, NULL, NULL,
- _mcd_marshal_VOID__BOOLEAN,
- G_TYPE_NONE, 1, G_TYPE_BOOLEAN);
+ NULL, G_TYPE_NONE, 1, G_TYPE_BOOLEAN);
if (!mce_signal_interface_quark)
{
diff --git a/src/mcd-transport.c b/src/mcd-transport.c
index 433fce1..e2a17e4 100644
--- a/src/mcd-transport.c
+++ b/src/mcd-transport.c
@@ -26,7 +26,6 @@
#include <glib.h>
#include "mcd-transport.h"
-#include "mcd-signals-marshal.h"
#include "mcd-enum-types.h"
/**
@@ -71,8 +70,7 @@ mcd_transport_plugin_base_init (gpointer iface)
G_TYPE_FROM_INTERFACE (iface),
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (McdTransportPluginIface, status_changed),
- NULL, NULL,
- _mcd_marshal_VOID__POINTER_UINT,
+ NULL, NULL, NULL,
G_TYPE_NONE, 2,
G_TYPE_POINTER, MCD_TYPE_TRANSPORT_STATUS);
initialized = TRUE;
More information about the telepathy-commits
mailing list