diff options
author | Xavier Claessens <xclaesse@gmail.com> | 2011-09-28 19:41:11 +0800 |
---|---|---|
committer | Xavier Claessens <xclaesse@gmail.com> | 2011-09-28 20:03:54 +0800 |
commit | 7978eacb5d49b518a7f7b4e7b92c8a7bfb8fc400 (patch) | |
tree | 9a6a63fef4f7c6eadd7c67a807b85068e7f45986 /libempathy | |
parent | 843f210c3bf26f6ecc93f90000e366ebc8296cc3 (diff) | |
download | gsoc2013-empathy-7978eacb5d49b518a7f7b4e7b92c8a7bfb8fc400.tar gsoc2013-empathy-7978eacb5d49b518a7f7b4e7b92c8a7bfb8fc400.tar.gz gsoc2013-empathy-7978eacb5d49b518a7f7b4e7b92c8a7bfb8fc400.tar.bz2 gsoc2013-empathy-7978eacb5d49b518a7f7b4e7b92c8a7bfb8fc400.tar.lz gsoc2013-empathy-7978eacb5d49b518a7f7b4e7b92c8a7bfb8fc400.tar.xz gsoc2013-empathy-7978eacb5d49b518a7f7b4e7b92c8a7bfb8fc400.tar.zst gsoc2013-empathy-7978eacb5d49b518a7f7b4e7b92c8a7bfb8fc400.zip |
Use g_cclosure_marshal_generic for all signals
No more ugly marshallers \o/
Diffstat (limited to 'libempathy')
-rw-r--r-- | libempathy/Makefile.am | 22 | ||||
-rw-r--r-- | libempathy/cheese-camera-device-monitor.c | 5 | ||||
-rw-r--r-- | libempathy/empathy-account-settings.c | 2 | ||||
-rw-r--r-- | libempathy/empathy-auth-factory.c | 4 | ||||
-rw-r--r-- | libempathy/empathy-camera-monitor.c | 4 | ||||
-rw-r--r-- | libempathy/empathy-chatroom-manager.c | 4 | ||||
-rw-r--r-- | libempathy/empathy-connection-managers.c | 2 | ||||
-rw-r--r-- | libempathy/empathy-connectivity.c | 5 | ||||
-rw-r--r-- | libempathy/empathy-contact-list.c | 11 | ||||
-rw-r--r-- | libempathy/empathy-contact.c | 3 | ||||
-rw-r--r-- | libempathy/empathy-ft-factory.c | 5 | ||||
-rw-r--r-- | libempathy/empathy-ft-handler.c | 15 | ||||
-rw-r--r-- | libempathy/empathy-individual-manager.c | 7 | ||||
-rw-r--r-- | libempathy/empathy-irc-network.c | 3 | ||||
-rw-r--r-- | libempathy/empathy-irc-server.c | 3 | ||||
-rw-r--r-- | libempathy/empathy-server-sasl-handler.c | 2 | ||||
-rw-r--r-- | libempathy/empathy-tp-chat.c | 11 | ||||
-rw-r--r-- | libempathy/empathy-tp-file.c | 1 | ||||
-rw-r--r-- | libempathy/empathy-tp-roomlist.c | 6 | ||||
-rw-r--r-- | libempathy/empathy-tp-streamed-media.c | 5 |
20 files changed, 43 insertions, 77 deletions
diff --git a/libempathy/Makefile.am b/libempathy/Makefile.am index 3cd971a5d..079b4736b 100644 --- a/libempathy/Makefile.am +++ b/libempathy/Makefile.am @@ -20,9 +20,6 @@ AM_CPPFLAGS = \ $(DISABLE_DEPRECATED) BUILT_SOURCES = \ - empathy-marshal.h \ - empathy-marshal.c \ - empathy-marshal.list \ empathy-enum-types.h \ empathy-enum-types.c @@ -135,24 +132,6 @@ check_c_sources = \ include $(top_srcdir)/tools/check-coding-style.mk check-local: check-coding-style -empathy-marshal.list: $(libempathy_la_SOURCES) Makefile.am - $(AM_V_GEN)( cd $(srcdir) && \ - sed -n -e 's/.*empathy_marshal_\([[:upper:][:digit:]]*__[[:upper:][:digit:]_]*\).*/\1/p' \ - $(libempathy_la_SOURCES) ) \ - | sed -e 's/__/:/' -e 'y/_/,/' | sort -u > $@.tmp - @if cmp -s $@.tmp $@; then \ - rm $@.tmp; \ - else \ - mv $@.tmp $@; \ - fi - -empathy-marshal.h: empathy-marshal.list Makefile - $(AM_V_GEN)$(GLIB_GENMARSHAL) --header --prefix=_empathy_marshal $< > empathy-marshal.h - -empathy-marshal.c: empathy-marshal.list Makefile - $(AM_V_GEN)echo "#include \"empathy-marshal.h\"" > $@ && \ - $(GLIB_GENMARSHAL) --body --prefix=_empathy_marshal $< >> empathy-marshal.c - empathy-enum-types.h: stamp-empathy-enum-types.h $(AM_V_GEN)true stamp-empathy-enum-types.h: $(libempathy_headers) Makefile @@ -203,7 +182,6 @@ ircnetworks_DATA = \ irc-networks.xml EXTRA_DIST = \ - empathy-marshal.list \ $(dtd_DATA) \ $(ircnetworks_DATA) diff --git a/libempathy/cheese-camera-device-monitor.c b/libempathy/cheese-camera-device-monitor.c index 85c6a0aa4..78b40fb70 100644 --- a/libempathy/cheese-camera-device-monitor.c +++ b/libempathy/cheese-camera-device-monitor.c @@ -43,7 +43,6 @@ #endif #include "cheese-camera-device-monitor.h" -#include "empathy-marshal.h" /** * SECTION:cheese-camera-device-monitor @@ -360,7 +359,7 @@ cheese_camera_device_monitor_class_init (CheeseCameraDeviceMonitorClass *klass) G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, G_STRUCT_OFFSET (CheeseCameraDeviceMonitorClass, added), NULL, NULL, - _empathy_marshal_VOID__STRING_STRING_STRING_INT, + g_cclosure_marshal_generic, G_TYPE_NONE, 4, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_INT); /** @@ -375,7 +374,7 @@ cheese_camera_device_monitor_class_init (CheeseCameraDeviceMonitorClass *klass) G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, G_STRUCT_OFFSET (CheeseCameraDeviceMonitorClass, removed), NULL, NULL, - g_cclosure_marshal_VOID__STRING, + g_cclosure_marshal_generic, G_TYPE_NONE, 1, G_TYPE_STRING); g_type_class_add_private (klass, sizeof (CheeseCameraDeviceMonitorPrivate)); diff --git a/libempathy/empathy-account-settings.c b/libempathy/empathy-account-settings.c index 50c8f992d..cd6b69e8c 100644 --- a/libempathy/empathy-account-settings.c +++ b/libempathy/empathy-account-settings.c @@ -336,7 +336,7 @@ empathy_account_settings_class_init ( g_signal_new ("password-retrieved", G_TYPE_FROM_CLASS (empathy_account_settings_class), G_SIGNAL_RUN_LAST, 0, NULL, NULL, - g_cclosure_marshal_VOID__VOID, + g_cclosure_marshal_generic, G_TYPE_NONE, 0); } diff --git a/libempathy/empathy-auth-factory.c b/libempathy/empathy-auth-factory.c index 56b3b73eb..4eb5134dd 100644 --- a/libempathy/empathy-auth-factory.c +++ b/libempathy/empathy-auth-factory.c @@ -552,7 +552,7 @@ empathy_auth_factory_class_init (EmpathyAuthFactoryClass *klass) G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, 0, NULL, NULL, - g_cclosure_marshal_VOID__OBJECT, + g_cclosure_marshal_generic, G_TYPE_NONE, 1, EMPATHY_TYPE_SERVER_TLS_HANDLER); @@ -561,7 +561,7 @@ empathy_auth_factory_class_init (EmpathyAuthFactoryClass *klass) G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, 0, NULL, NULL, - g_cclosure_marshal_VOID__OBJECT, + g_cclosure_marshal_generic, G_TYPE_NONE, 1, EMPATHY_TYPE_SERVER_SASL_HANDLER); } diff --git a/libempathy/empathy-camera-monitor.c b/libempathy/empathy-camera-monitor.c index 3b5221eb8..7d9d695e8 100644 --- a/libempathy/empathy-camera-monitor.c +++ b/libempathy/empathy-camera-monitor.c @@ -228,14 +228,14 @@ empathy_camera_monitor_class_init (EmpathyCameraMonitorClass *klass) g_signal_new ("added", G_OBJECT_CLASS_TYPE (klass), G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, 0, NULL, NULL, - g_cclosure_marshal_VOID__BOXED, + g_cclosure_marshal_generic, G_TYPE_NONE, 1, EMPATHY_TYPE_CAMERA); signals[CAMERA_REMOVED] = g_signal_new ("removed", G_OBJECT_CLASS_TYPE (klass), G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, 0, NULL, NULL, - g_cclosure_marshal_VOID__BOXED, + g_cclosure_marshal_generic, G_TYPE_NONE, 1, EMPATHY_TYPE_CAMERA); g_type_class_add_private (object_class, diff --git a/libempathy/empathy-chatroom-manager.c b/libempathy/empathy-chatroom-manager.c index 67ec6cddb..9a9a7b250 100644 --- a/libempathy/empathy-chatroom-manager.c +++ b/libempathy/empathy-chatroom-manager.c @@ -648,7 +648,7 @@ empathy_chatroom_manager_class_init (EmpathyChatroomManagerClass *klass) G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, 0, NULL, NULL, - g_cclosure_marshal_VOID__OBJECT, + g_cclosure_marshal_generic, G_TYPE_NONE, 1, EMPATHY_TYPE_CHATROOM); @@ -656,7 +656,7 @@ empathy_chatroom_manager_class_init (EmpathyChatroomManagerClass *klass) G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, 0, NULL, NULL, - g_cclosure_marshal_VOID__OBJECT, + g_cclosure_marshal_generic, G_TYPE_NONE, 1, EMPATHY_TYPE_CHATROOM); diff --git a/libempathy/empathy-connection-managers.c b/libempathy/empathy-connection-managers.c index 30a9b8471..a45731686 100644 --- a/libempathy/empathy-connection-managers.c +++ b/libempathy/empathy-connection-managers.c @@ -150,7 +150,7 @@ empathy_connection_managers_class_init ( G_TYPE_FROM_CLASS (object_class), G_SIGNAL_RUN_LAST, 0, NULL, NULL, - g_cclosure_marshal_VOID__VOID, + g_cclosure_marshal_generic, G_TYPE_NONE, 0); } diff --git a/libempathy/empathy-connectivity.c b/libempathy/empathy-connectivity.c index 3c9805c54..f84505f9b 100644 --- a/libempathy/empathy-connectivity.c +++ b/libempathy/empathy-connectivity.c @@ -33,7 +33,6 @@ #include <telepathy-glib/util.h> #include "empathy-utils.h" -#include "empathy-marshal.h" #define DEBUG_FLAG EMPATHY_DEBUG_CONNECTIVITY #include "empathy-debug.h" @@ -220,7 +219,7 @@ empathy_connectivity_init (EmpathyConnectivity *connectivity) "net.connman.Manager"); dbus_g_object_register_marshaller ( - _empathy_marshal_VOID__STRING, + g_cclosure_marshal_generic, G_TYPE_NONE, G_TYPE_STRING, G_TYPE_INVALID); dbus_g_proxy_add_signal (priv->proxy, "StateChanged", @@ -364,7 +363,7 @@ empathy_connectivity_class_init (EmpathyConnectivityClass *klass) G_SIGNAL_RUN_LAST, 0, NULL, NULL, - _empathy_marshal_VOID__BOOLEAN, + g_cclosure_marshal_generic, G_TYPE_NONE, 1, G_TYPE_BOOLEAN, NULL); diff --git a/libempathy/empathy-contact-list.c b/libempathy/empathy-contact-list.c index d28866735..e532782d5 100644 --- a/libempathy/empathy-contact-list.c +++ b/libempathy/empathy-contact-list.c @@ -22,7 +22,6 @@ #include "config.h" #include "empathy-contact-list.h" -#include "empathy-marshal.h" static void contact_list_base_init (gpointer klass); @@ -59,7 +58,7 @@ contact_list_base_init (gpointer klass) G_SIGNAL_RUN_LAST, 0, NULL, NULL, - _empathy_marshal_VOID__OBJECT_OBJECT_UINT_STRING, + g_cclosure_marshal_generic, G_TYPE_NONE, 4, EMPATHY_TYPE_CONTACT, EMPATHY_TYPE_CONTACT, G_TYPE_UINT, G_TYPE_STRING); @@ -68,7 +67,7 @@ contact_list_base_init (gpointer klass) G_SIGNAL_RUN_LAST, 0, NULL, NULL, - _empathy_marshal_VOID__OBJECT_OBJECT_UINT_STRING_BOOLEAN, + g_cclosure_marshal_generic, G_TYPE_NONE, 5, EMPATHY_TYPE_CONTACT, EMPATHY_TYPE_CONTACT, G_TYPE_UINT, G_TYPE_STRING, G_TYPE_BOOLEAN); @@ -78,7 +77,7 @@ contact_list_base_init (gpointer klass) G_SIGNAL_RUN_LAST, 0, NULL, NULL, - _empathy_marshal_VOID__OBJECT_BOOLEAN, + g_cclosure_marshal_generic, G_TYPE_NONE, 2, EMPATHY_TYPE_CONTACT, G_TYPE_BOOLEAN); @@ -87,7 +86,7 @@ contact_list_base_init (gpointer klass) G_SIGNAL_RUN_LAST, 0, NULL, NULL, - _empathy_marshal_VOID__OBJECT_OBJECT_UINT_STRING_BOOLEAN, + g_cclosure_marshal_generic, G_TYPE_NONE, 5, EMPATHY_TYPE_CONTACT, EMPATHY_TYPE_CONTACT, G_TYPE_UINT, G_TYPE_STRING, G_TYPE_BOOLEAN); @@ -97,7 +96,7 @@ contact_list_base_init (gpointer klass) G_SIGNAL_RUN_LAST, 0, NULL, NULL, - _empathy_marshal_VOID__OBJECT_STRING_BOOLEAN, + g_cclosure_marshal_generic, G_TYPE_NONE, 3, EMPATHY_TYPE_CONTACT, G_TYPE_STRING, G_TYPE_BOOLEAN); diff --git a/libempathy/empathy-contact.c b/libempathy/empathy-contact.c index f27de0414..935afb556 100644 --- a/libempathy/empathy-contact.c +++ b/libempathy/empathy-contact.c @@ -44,7 +44,6 @@ #include "empathy-individual-manager.h" #include "empathy-utils.h" #include "empathy-enum-types.h" -#include "empathy-marshal.h" #include "empathy-location.h" #define DEBUG_FLAG EMPATHY_DEBUG_CONTACT @@ -405,7 +404,7 @@ empathy_contact_class_init (EmpathyContactClass *class) G_SIGNAL_RUN_LAST, 0, NULL, NULL, - _empathy_marshal_VOID__UINT_UINT, + g_cclosure_marshal_generic, G_TYPE_NONE, 2, G_TYPE_UINT, G_TYPE_UINT); diff --git a/libempathy/empathy-ft-factory.c b/libempathy/empathy-ft-factory.c index 5097f9b1e..fb2497a54 100644 --- a/libempathy/empathy-ft-factory.c +++ b/libempathy/empathy-ft-factory.c @@ -27,7 +27,6 @@ #include "empathy-ft-factory.h" #include "empathy-ft-handler.h" -#include "empathy-marshal.h" #include "empathy-request-util.h" #include "empathy-utils.h" @@ -126,7 +125,7 @@ empathy_ft_factory_class_init (EmpathyFTFactoryClass *klass) G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, 0, NULL, NULL, - _empathy_marshal_VOID__OBJECT_POINTER, + g_cclosure_marshal_generic, G_TYPE_NONE, 2, EMPATHY_TYPE_FT_HANDLER, G_TYPE_POINTER); /** @@ -149,7 +148,7 @@ empathy_ft_factory_class_init (EmpathyFTFactoryClass *klass) G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, 0, NULL, NULL, - _empathy_marshal_VOID__OBJECT_POINTER, + g_cclosure_marshal_generic, G_TYPE_NONE, 2, EMPATHY_TYPE_FT_HANDLER, G_TYPE_POINTER); } diff --git a/libempathy/empathy-ft-handler.c b/libempathy/empathy-ft-handler.c index 4cc04c8e0..facc49a3b 100644 --- a/libempathy/empathy-ft-handler.c +++ b/libempathy/empathy-ft-handler.c @@ -30,7 +30,6 @@ #include "empathy-ft-handler.h" #include "empathy-tp-contact-factory.h" -#include "empathy-marshal.h" #include "empathy-time.h" #include "empathy-utils.h" @@ -440,7 +439,7 @@ empathy_ft_handler_class_init (EmpathyFTHandlerClass *klass) signals[TRANSFER_STARTED] = g_signal_new ("transfer-started", G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, 0, NULL, NULL, - g_cclosure_marshal_VOID__OBJECT, + g_cclosure_marshal_generic, G_TYPE_NONE, 1, EMPATHY_TYPE_TP_FILE); @@ -455,7 +454,7 @@ empathy_ft_handler_class_init (EmpathyFTHandlerClass *klass) signals[TRANSFER_DONE] = g_signal_new ("transfer-done", G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, 0, NULL, NULL, - g_cclosure_marshal_VOID__OBJECT, + g_cclosure_marshal_generic, G_TYPE_NONE, 1, EMPATHY_TYPE_TP_FILE); @@ -473,7 +472,7 @@ empathy_ft_handler_class_init (EmpathyFTHandlerClass *klass) signals[TRANSFER_ERROR] = g_signal_new ("transfer-error", G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, 0, NULL, NULL, - g_cclosure_marshal_VOID__POINTER, + g_cclosure_marshal_generic, G_TYPE_NONE, 1, G_TYPE_POINTER); @@ -492,7 +491,7 @@ empathy_ft_handler_class_init (EmpathyFTHandlerClass *klass) signals[TRANSFER_PROGRESS] = g_signal_new ("transfer-progress", G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, 0, NULL, NULL, - _empathy_marshal_VOID__UINT64_UINT64_UINT_DOUBLE, + g_cclosure_marshal_generic, G_TYPE_NONE, 4, G_TYPE_UINT64, G_TYPE_UINT64, G_TYPE_UINT, G_TYPE_DOUBLE); @@ -510,7 +509,7 @@ empathy_ft_handler_class_init (EmpathyFTHandlerClass *klass) signals[HASHING_STARTED] = g_signal_new ("hashing-started", G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, 0, NULL, NULL, - g_cclosure_marshal_VOID__VOID, + g_cclosure_marshal_generic, G_TYPE_NONE, 0); /** @@ -525,7 +524,7 @@ empathy_ft_handler_class_init (EmpathyFTHandlerClass *klass) signals[HASHING_PROGRESS] = g_signal_new ("hashing-progress", G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, 0, NULL, NULL, - _empathy_marshal_VOID__UINT64_UINT64, + g_cclosure_marshal_generic, G_TYPE_NONE, 2, G_TYPE_UINT64, G_TYPE_UINT64); @@ -539,7 +538,7 @@ empathy_ft_handler_class_init (EmpathyFTHandlerClass *klass) signals[HASHING_DONE] = g_signal_new ("hashing-done", G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, 0, NULL, NULL, - g_cclosure_marshal_VOID__VOID, + g_cclosure_marshal_generic, G_TYPE_NONE, 0); } diff --git a/libempathy/empathy-individual-manager.c b/libempathy/empathy-individual-manager.c index 8d140178c..833a5692d 100644 --- a/libempathy/empathy-individual-manager.c +++ b/libempathy/empathy-individual-manager.c @@ -35,7 +35,6 @@ #include <extensions/extensions.h> #include "empathy-individual-manager.h" -#include "empathy-marshal.h" #include "empathy-utils.h" #include "empathy-contact-manager.h" @@ -314,7 +313,7 @@ empathy_individual_manager_class_init (EmpathyIndividualManagerClass *klass) G_SIGNAL_RUN_LAST, 0, NULL, NULL, - _empathy_marshal_VOID__OBJECT_STRING_BOOLEAN, + g_cclosure_marshal_generic, G_TYPE_NONE, 3, FOLKS_TYPE_INDIVIDUAL, G_TYPE_STRING, G_TYPE_BOOLEAN); signals[FAVOURITES_CHANGED] = @@ -323,7 +322,7 @@ empathy_individual_manager_class_init (EmpathyIndividualManagerClass *klass) G_SIGNAL_RUN_LAST, 0, NULL, NULL, - _empathy_marshal_VOID__OBJECT_BOOLEAN, + g_cclosure_marshal_generic, G_TYPE_NONE, 2, FOLKS_TYPE_INDIVIDUAL, G_TYPE_BOOLEAN); signals[MEMBERS_CHANGED] = @@ -332,7 +331,7 @@ empathy_individual_manager_class_init (EmpathyIndividualManagerClass *klass) G_SIGNAL_RUN_LAST, 0, NULL, NULL, - _empathy_marshal_VOID__STRING_OBJECT_OBJECT_UINT, + g_cclosure_marshal_generic, G_TYPE_NONE, 4, G_TYPE_STRING, G_TYPE_POINTER, G_TYPE_POINTER, G_TYPE_UINT); diff --git a/libempathy/empathy-irc-network.c b/libempathy/empathy-irc-network.c index 68e071be8..ec0cfffb1 100644 --- a/libempathy/empathy-irc-network.c +++ b/libempathy/empathy-irc-network.c @@ -27,7 +27,6 @@ #include <telepathy-glib/util.h> -#include "empathy-marshal.h" #include "empathy-irc-network.h" #include "empathy-utils.h" @@ -216,7 +215,7 @@ empathy_irc_network_class_init (EmpathyIrcNetworkClass *klass) G_SIGNAL_RUN_LAST | G_SIGNAL_DETAILED, 0, NULL, NULL, - g_cclosure_marshal_VOID__VOID, + g_cclosure_marshal_generic, G_TYPE_NONE, 0); } diff --git a/libempathy/empathy-irc-server.c b/libempathy/empathy-irc-server.c index 41da5385e..cb1fbfc2f 100644 --- a/libempathy/empathy-irc-server.c +++ b/libempathy/empathy-irc-server.c @@ -26,7 +26,6 @@ #include <telepathy-glib/util.h> -#include "empathy-marshal.h" #include "empathy-irc-server.h" #include "empathy-utils.h" @@ -202,7 +201,7 @@ empathy_irc_server_class_init (EmpathyIrcServerClass *klass) G_SIGNAL_RUN_LAST | G_SIGNAL_DETAILED, 0, NULL, NULL, - g_cclosure_marshal_VOID__VOID, + g_cclosure_marshal_generic, G_TYPE_NONE, 0); } diff --git a/libempathy/empathy-server-sasl-handler.c b/libempathy/empathy-server-sasl-handler.c index 78db431e6..d37851405 100644 --- a/libempathy/empathy-server-sasl-handler.c +++ b/libempathy/empathy-server-sasl-handler.c @@ -337,7 +337,7 @@ empathy_server_sasl_handler_class_init (EmpathyServerSASLHandlerClass *klass) G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, 0, NULL, NULL, - g_cclosure_marshal_VOID__VOID, + g_cclosure_marshal_generic, G_TYPE_NONE, 0); } diff --git a/libempathy/empathy-tp-chat.c b/libempathy/empathy-tp-chat.c index 11a6e7de5..dcd6193ec 100644 --- a/libempathy/empathy-tp-chat.c +++ b/libempathy/empathy-tp-chat.c @@ -30,7 +30,6 @@ #include "empathy-tp-chat.h" #include "empathy-tp-contact-factory.h" #include "empathy-contact-list.h" -#include "empathy-marshal.h" #include "empathy-request-util.h" #include "empathy-time.h" #include "empathy-utils.h" @@ -1267,7 +1266,7 @@ empathy_tp_chat_class_init (EmpathyTpChatClass *klass) G_SIGNAL_RUN_LAST, 0, NULL, NULL, - g_cclosure_marshal_VOID__OBJECT, + g_cclosure_marshal_generic, G_TYPE_NONE, 1, EMPATHY_TYPE_MESSAGE); @@ -1277,7 +1276,7 @@ empathy_tp_chat_class_init (EmpathyTpChatClass *klass) G_SIGNAL_RUN_LAST, 0, NULL, NULL, - _empathy_marshal_VOID__STRING_UINT_STRING, + g_cclosure_marshal_generic, G_TYPE_NONE, 3, G_TYPE_STRING, G_TYPE_UINT, G_TYPE_STRING); @@ -1287,7 +1286,7 @@ empathy_tp_chat_class_init (EmpathyTpChatClass *klass) G_SIGNAL_RUN_LAST, 0, NULL, NULL, - _empathy_marshal_VOID__OBJECT_UINT, + g_cclosure_marshal_generic, G_TYPE_NONE, 2, EMPATHY_TYPE_CONTACT, G_TYPE_UINT); @@ -1297,7 +1296,7 @@ empathy_tp_chat_class_init (EmpathyTpChatClass *klass) G_SIGNAL_RUN_LAST, 0, NULL, NULL, - _empathy_marshal_VOID__STRING_BOXED, + g_cclosure_marshal_generic, G_TYPE_NONE, 2, G_TYPE_STRING, G_TYPE_VALUE); @@ -1307,7 +1306,7 @@ empathy_tp_chat_class_init (EmpathyTpChatClass *klass) G_SIGNAL_RUN_LAST, 0, NULL, NULL, - g_cclosure_marshal_VOID__OBJECT, + g_cclosure_marshal_generic, G_TYPE_NONE, 1, EMPATHY_TYPE_MESSAGE); diff --git a/libempathy/empathy-tp-file.c b/libempathy/empathy-tp-file.c index c7a6a7073..ff2099ee9 100644 --- a/libempathy/empathy-tp-file.c +++ b/libempathy/empathy-tp-file.c @@ -44,7 +44,6 @@ #include <telepathy-glib/interfaces.h> #include "empathy-tp-file.h" -#include "empathy-marshal.h" #include "empathy-time.h" #include "empathy-utils.h" diff --git a/libempathy/empathy-tp-roomlist.c b/libempathy/empathy-tp-roomlist.c index b70578156..1e53facdc 100644 --- a/libempathy/empathy-tp-roomlist.c +++ b/libempathy/empathy-tp-roomlist.c @@ -432,7 +432,7 @@ empathy_tp_roomlist_class_init (EmpathyTpRoomlistClass *klass) G_SIGNAL_RUN_LAST, 0, NULL, NULL, - g_cclosure_marshal_VOID__OBJECT, + g_cclosure_marshal_generic, G_TYPE_NONE, 1, EMPATHY_TYPE_CHATROOM); @@ -442,7 +442,7 @@ empathy_tp_roomlist_class_init (EmpathyTpRoomlistClass *klass) G_SIGNAL_RUN_LAST, 0, NULL, NULL, - g_cclosure_marshal_VOID__VOID, + g_cclosure_marshal_generic, G_TYPE_NONE, 0); @@ -452,7 +452,7 @@ empathy_tp_roomlist_class_init (EmpathyTpRoomlistClass *klass) G_SIGNAL_RUN_LAST | G_SIGNAL_DETAILED, 0, NULL, NULL, - g_cclosure_marshal_VOID__POINTER, + g_cclosure_marshal_generic, G_TYPE_NONE, 1, G_TYPE_POINTER); diff --git a/libempathy/empathy-tp-streamed-media.c b/libempathy/empathy-tp-streamed-media.c index b79e4b6b5..87ca01db5 100644 --- a/libempathy/empathy-tp-streamed-media.c +++ b/libempathy/empathy-tp-streamed-media.c @@ -30,7 +30,6 @@ #include "empathy-tp-streamed-media.h" #include "empathy-tp-contact-factory.h" #include "empathy-utils.h" -#include "empathy-marshal.h" #define DEBUG_FLAG EMPATHY_DEBUG_VOIP #include "empathy-debug.h" @@ -566,7 +565,7 @@ empathy_tp_streamed_media_class_init (EmpathyTpStreamedMediaClass *klass) G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, 0, NULL, NULL, - _empathy_marshal_VOID__UINT_STRING, + g_cclosure_marshal_generic, G_TYPE_NONE, 2, G_TYPE_UINT, G_TYPE_STRING); @@ -575,7 +574,7 @@ empathy_tp_streamed_media_class_init (EmpathyTpStreamedMediaClass *klass) G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, 0, NULL, NULL, - _empathy_marshal_VOID__UINT_STRING, + g_cclosure_marshal_generic, G_TYPE_NONE, 2, G_TYPE_UINT, G_TYPE_STRING); } |