From 46505a8314d85107704fcc41cd212b1be1b9237a Mon Sep 17 00:00:00 2001 From: "Jasper St. Pierre" Date: Tue, 18 Oct 2011 18:19:22 -0400 Subject: [PATCH] etc: Use generic marshaller https://bugzilla.gnome.org/show_bug.cgi?id=662152 --- src/Makefile-tray.am | 29 -------------------------- src/calendar-server/calendar-sources.c | 4 ++-- src/gvc/gvc-channel-map.c | 3 +-- src/gvc/gvc-mixer-control.c | 21 +++++++------------ src/tray/na-marshal.list | 3 --- src/tray/na-tray-manager.c | 17 +++++---------- 6 files changed, 15 insertions(+), 62 deletions(-) delete mode 100644 src/tray/na-marshal.list diff --git a/src/Makefile-tray.am b/src/Makefile-tray.am index 1377e0c34..a3bd7d3a6 100644 --- a/src/Makefile-tray.am +++ b/src/Makefile-tray.am @@ -5,14 +5,8 @@ tray_cflags = \ $(TRAY_CFLAGS) \ $(NULL) -tray_built_sources = \ - na-marshal.h \ - na-marshal.c - BUILT_SOURCES += $(tray_built_sources) -TRAY_STAMP_FILES = stamp-na-marshal.h - # please, keep this sorted alphabetically tray_source = \ tray/na-tray-child.c \ @@ -21,26 +15,6 @@ tray_source = \ tray/na-tray-manager.h \ $(NULL) -na-marshal.h: stamp-na-marshal.h - @true -stamp-na-marshal.h: Makefile tray/na-marshal.list - $(AM_V_GEN) $(GLIB_GENMARSHAL) \ - --prefix=_na_marshal \ - --header \ - $(srcdir)/tray/na-marshal.list > xgen-tmh && \ - (cmp -s xgen-tmh na-marshal.h || cp -f xgen-tmh na-marshal.h) && \ - rm -f xgen-tmh && \ - echo timestamp > $(@F) - -na-marshal.c: Makefile tray/na-marshal.list - $(AM_V_GEN) (echo "#include \"na-marshal.h\"" ; \ - $(GLIB_GENMARSHAL) \ - --prefix=_na_marshal \ - --body \ - $(srcdir)/tray/na-marshal.list ) > xgen-tmc && \ - cp -f xgen-tmc na-marshal.c && \ - rm -f xgen-tmc - noinst_LTLIBRARIES += libtray.la libtray_la_LIBADD = $(TRAY_LIBS) @@ -52,6 +26,3 @@ libtray_la_CPPFLAGS = $(tray_cflags) libtray_la_LDFLAGS = $(LDADD) CLEANFILES += $(TRAY_STAMP_FILES) $(BUILT_SOURCES) - -EXTRA_DIST += \ - tray/na-marshal.list diff --git a/src/calendar-server/calendar-sources.c b/src/calendar-server/calendar-sources.c index fa1fcaccd..8d68af930 100644 --- a/src/calendar-server/calendar-sources.c +++ b/src/calendar-server/calendar-sources.c @@ -150,7 +150,7 @@ calendar_sources_class_init (CalendarSourcesClass *klass) appointment_sources_changed), NULL, NULL, - g_cclosure_marshal_VOID__VOID, + NULL, G_TYPE_NONE, 0); @@ -162,7 +162,7 @@ calendar_sources_class_init (CalendarSourcesClass *klass) task_sources_changed), NULL, NULL, - g_cclosure_marshal_VOID__VOID, + NULL, G_TYPE_NONE, 0); } diff --git a/src/gvc/gvc-channel-map.c b/src/gvc/gvc-channel-map.c index a2073fd33..74ff40534 100644 --- a/src/gvc/gvc-channel-map.c +++ b/src/gvc/gvc-channel-map.c @@ -171,8 +171,7 @@ gvc_channel_map_class_init (GvcChannelMapClass *klass) G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GvcChannelMapClass, volume_changed), - NULL, NULL, - g_cclosure_marshal_VOID__BOOLEAN, + NULL, NULL, NULL, G_TYPE_NONE, 1, G_TYPE_BOOLEAN); g_type_class_add_private (klass, sizeof (GvcChannelMapPrivate)); diff --git a/src/gvc/gvc-mixer-control.c b/src/gvc/gvc-mixer-control.c index 4d3a9f403..aaa29c0ae 100644 --- a/src/gvc/gvc-mixer-control.c +++ b/src/gvc/gvc-mixer-control.c @@ -2137,56 +2137,49 @@ gvc_mixer_control_class_init (GvcMixerControlClass *klass) G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GvcMixerControlClass, state_changed), - NULL, NULL, - g_cclosure_marshal_VOID__UINT, + NULL, NULL, NULL, G_TYPE_NONE, 1, G_TYPE_UINT); signals [STREAM_ADDED] = g_signal_new ("stream-added", G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GvcMixerControlClass, stream_added), - NULL, NULL, - g_cclosure_marshal_VOID__UINT, + NULL, NULL, NULL, G_TYPE_NONE, 1, G_TYPE_UINT); signals [STREAM_REMOVED] = g_signal_new ("stream-removed", G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GvcMixerControlClass, stream_removed), - NULL, NULL, - g_cclosure_marshal_VOID__UINT, + NULL, NULL, NULL, G_TYPE_NONE, 1, G_TYPE_UINT); signals [CARD_ADDED] = g_signal_new ("card-added", G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GvcMixerControlClass, card_added), - NULL, NULL, - g_cclosure_marshal_VOID__UINT, + NULL, NULL, NULL, G_TYPE_NONE, 1, G_TYPE_UINT); signals [CARD_REMOVED] = g_signal_new ("card-removed", G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GvcMixerControlClass, card_removed), - NULL, NULL, - g_cclosure_marshal_VOID__UINT, + NULL, NULL, NULL, G_TYPE_NONE, 1, G_TYPE_UINT); signals [DEFAULT_SINK_CHANGED] = g_signal_new ("default-sink-changed", G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GvcMixerControlClass, default_sink_changed), - NULL, NULL, - g_cclosure_marshal_VOID__UINT, + NULL, NULL, NULL, G_TYPE_NONE, 1, G_TYPE_UINT); signals [DEFAULT_SOURCE_CHANGED] = g_signal_new ("default-source-changed", G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GvcMixerControlClass, default_source_changed), - NULL, NULL, - g_cclosure_marshal_VOID__UINT, + NULL, NULL, NULL, G_TYPE_NONE, 1, G_TYPE_UINT); g_type_class_add_private (klass, sizeof (GvcMixerControlPrivate)); diff --git a/src/tray/na-marshal.list b/src/tray/na-marshal.list deleted file mode 100644 index e3fc39930..000000000 --- a/src/tray/na-marshal.list +++ /dev/null @@ -1,3 +0,0 @@ -VOID:OBJECT,OBJECT -VOID:OBJECT,STRING,LONG,LONG -VOID:OBJECT,LONG diff --git a/src/tray/na-tray-manager.c b/src/tray/na-tray-manager.c index 53546198c..7837c7c98 100644 --- a/src/tray/na-tray-manager.c +++ b/src/tray/na-tray-manager.c @@ -34,8 +34,6 @@ #endif #include -#include "na-marshal.h" - /* Signals */ enum { @@ -143,8 +141,7 @@ na_tray_manager_class_init (NaTrayManagerClass *klass) G_OBJECT_CLASS_TYPE (klass), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (NaTrayManagerClass, tray_icon_added), - NULL, NULL, - g_cclosure_marshal_VOID__OBJECT, + NULL, NULL, NULL, G_TYPE_NONE, 1, GTK_TYPE_SOCKET); @@ -153,8 +150,7 @@ na_tray_manager_class_init (NaTrayManagerClass *klass) G_OBJECT_CLASS_TYPE (klass), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (NaTrayManagerClass, tray_icon_removed), - NULL, NULL, - g_cclosure_marshal_VOID__OBJECT, + NULL, NULL, NULL, G_TYPE_NONE, 1, GTK_TYPE_SOCKET); manager_signals[MESSAGE_SENT] = @@ -162,8 +158,7 @@ na_tray_manager_class_init (NaTrayManagerClass *klass) G_OBJECT_CLASS_TYPE (klass), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (NaTrayManagerClass, message_sent), - NULL, NULL, - _na_marshal_VOID__OBJECT_STRING_LONG_LONG, + NULL, NULL, NULL, G_TYPE_NONE, 4, GTK_TYPE_SOCKET, G_TYPE_STRING, @@ -174,8 +169,7 @@ na_tray_manager_class_init (NaTrayManagerClass *klass) G_OBJECT_CLASS_TYPE (klass), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (NaTrayManagerClass, message_cancelled), - NULL, NULL, - _na_marshal_VOID__OBJECT_LONG, + NULL, NULL, NULL, G_TYPE_NONE, 2, GTK_TYPE_SOCKET, G_TYPE_LONG); @@ -184,8 +178,7 @@ na_tray_manager_class_init (NaTrayManagerClass *klass) G_OBJECT_CLASS_TYPE (klass), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (NaTrayManagerClass, lost_selection), - NULL, NULL, - g_cclosure_marshal_VOID__VOID, + NULL, NULL, NULL, G_TYPE_NONE, 0); #if defined (GDK_WINDOWING_X11)