isa/gnome-shell
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

etc: Use generic marshaller

Browse Source 
https://bugzilla.gnome.org/show_bug.cgi?id=662152
This commit is contained in:
Jasper St. Pierre 2011-10-18 18:19:22 -04:00
parent 78fb102002
commit 46505a8314
6 changed files with 15 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/Makefile-tray.am
View File

@ -5,14 +5,8 @@ tray_cflags = \
$(TRAY_CFLAGS) \ $(TRAY_CFLAGS) \
$(NULL) $(NULL)
tray_built_sources = \
na-marshal.h \
na-marshal.c
BUILT_SOURCES += $(tray_built_sources) BUILT_SOURCES += $(tray_built_sources)
TRAY_STAMP_FILES = stamp-na-marshal.h
# please, keep this sorted alphabetically # please, keep this sorted alphabetically
tray_source = \ tray_source = \
tray/na-tray-child.c \ tray/na-tray-child.c \
@ -21,26 +15,6 @@ tray_source = \
tray/na-tray-manager.h \ tray/na-tray-manager.h \
$(NULL) $(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 noinst_LTLIBRARIES += libtray.la
libtray_la_LIBADD = $(TRAY_LIBS) libtray_la_LIBADD = $(TRAY_LIBS)
@ -52,6 +26,3 @@ libtray_la_CPPFLAGS = $(tray_cflags)
libtray_la_LDFLAGS = $(LDADD) libtray_la_LDFLAGS = $(LDADD)
CLEANFILES += $(TRAY_STAMP_FILES) $(BUILT_SOURCES) CLEANFILES += $(TRAY_STAMP_FILES) $(BUILT_SOURCES)
EXTRA_DIST += \
tray/na-marshal.list

4
src/calendar-server/calendar-sources.c
View File

@ -150,7 +150,7 @@ calendar_sources_class_init (CalendarSourcesClass *klass)
appointment_sources_changed), appointment_sources_changed),
NULL, NULL,
NULL, NULL,
g_cclosure_marshal_VOID__VOID, NULL,
G_TYPE_NONE, G_TYPE_NONE,
0); 0);
@ -162,7 +162,7 @@ calendar_sources_class_init (CalendarSourcesClass *klass)
task_sources_changed), task_sources_changed),
NULL, NULL,
NULL, NULL,
g_cclosure_marshal_VOID__VOID, NULL,
G_TYPE_NONE, G_TYPE_NONE,
0); 0);
} }

3
src/gvc/gvc-channel-map.c
View File

@ -171,8 +171,7 @@ gvc_channel_map_class_init (GvcChannelMapClass *klass)
G_TYPE_FROM_CLASS (klass), G_TYPE_FROM_CLASS (klass),
G_SIGNAL_RUN_LAST, G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GvcChannelMapClass, volume_changed), G_STRUCT_OFFSET (GvcChannelMapClass, volume_changed),
NULL, NULL, NULL, NULL, NULL,
g_cclosure_marshal_VOID__BOOLEAN,
G_TYPE_NONE, 1, G_TYPE_BOOLEAN); G_TYPE_NONE, 1, G_TYPE_BOOLEAN);
g_type_class_add_private (klass, sizeof (GvcChannelMapPrivate)); g_type_class_add_private (klass, sizeof (GvcChannelMapPrivate));

21
src/gvc/gvc-mixer-control.c
View File

@ -2137,56 +2137,49 @@ gvc_mixer_control_class_init (GvcMixerControlClass *klass)
G_TYPE_FROM_CLASS (klass), G_TYPE_FROM_CLASS (klass),
G_SIGNAL_RUN_LAST, G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GvcMixerControlClass, state_changed), G_STRUCT_OFFSET (GvcMixerControlClass, state_changed),
NULL, NULL, NULL, NULL, NULL,
g_cclosure_marshal_VOID__UINT,
G_TYPE_NONE, 1, G_TYPE_UINT); G_TYPE_NONE, 1, G_TYPE_UINT);
signals [STREAM_ADDED] = signals [STREAM_ADDED] =
g_signal_new ("stream-added", g_signal_new ("stream-added",
G_TYPE_FROM_CLASS (klass), G_TYPE_FROM_CLASS (klass),
G_SIGNAL_RUN_LAST, G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GvcMixerControlClass, stream_added), G_STRUCT_OFFSET (GvcMixerControlClass, stream_added),
NULL, NULL, NULL, NULL, NULL,
g_cclosure_marshal_VOID__UINT,
G_TYPE_NONE, 1, G_TYPE_UINT); G_TYPE_NONE, 1, G_TYPE_UINT);
signals [STREAM_REMOVED] = signals [STREAM_REMOVED] =
g_signal_new ("stream-removed", g_signal_new ("stream-removed",
G_TYPE_FROM_CLASS (klass), G_TYPE_FROM_CLASS (klass),
G_SIGNAL_RUN_LAST, G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GvcMixerControlClass, stream_removed), G_STRUCT_OFFSET (GvcMixerControlClass, stream_removed),
NULL, NULL, NULL, NULL, NULL,
g_cclosure_marshal_VOID__UINT,
G_TYPE_NONE, 1, G_TYPE_UINT); G_TYPE_NONE, 1, G_TYPE_UINT);
signals [CARD_ADDED] = signals [CARD_ADDED] =
g_signal_new ("card-added", g_signal_new ("card-added",
G_TYPE_FROM_CLASS (klass), G_TYPE_FROM_CLASS (klass),
G_SIGNAL_RUN_LAST, G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GvcMixerControlClass, card_added), G_STRUCT_OFFSET (GvcMixerControlClass, card_added),
NULL, NULL, NULL, NULL, NULL,
g_cclosure_marshal_VOID__UINT,
G_TYPE_NONE, 1, G_TYPE_UINT); G_TYPE_NONE, 1, G_TYPE_UINT);
signals [CARD_REMOVED] = signals [CARD_REMOVED] =
g_signal_new ("card-removed", g_signal_new ("card-removed",
G_TYPE_FROM_CLASS (klass), G_TYPE_FROM_CLASS (klass),
G_SIGNAL_RUN_LAST, G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GvcMixerControlClass, card_removed), G_STRUCT_OFFSET (GvcMixerControlClass, card_removed),
NULL, NULL, NULL, NULL, NULL,
g_cclosure_marshal_VOID__UINT,
G_TYPE_NONE, 1, G_TYPE_UINT); G_TYPE_NONE, 1, G_TYPE_UINT);
signals [DEFAULT_SINK_CHANGED] = signals [DEFAULT_SINK_CHANGED] =
g_signal_new ("default-sink-changed", g_signal_new ("default-sink-changed",
G_TYPE_FROM_CLASS (klass), G_TYPE_FROM_CLASS (klass),
G_SIGNAL_RUN_LAST, G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GvcMixerControlClass, default_sink_changed), G_STRUCT_OFFSET (GvcMixerControlClass, default_sink_changed),
NULL, NULL, NULL, NULL, NULL,
g_cclosure_marshal_VOID__UINT,
G_TYPE_NONE, 1, G_TYPE_UINT); G_TYPE_NONE, 1, G_TYPE_UINT);
signals [DEFAULT_SOURCE_CHANGED] = signals [DEFAULT_SOURCE_CHANGED] =
g_signal_new ("default-source-changed", g_signal_new ("default-source-changed",
G_TYPE_FROM_CLASS (klass), G_TYPE_FROM_CLASS (klass),
G_SIGNAL_RUN_LAST, G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GvcMixerControlClass, default_source_changed), G_STRUCT_OFFSET (GvcMixerControlClass, default_source_changed),
NULL, NULL, NULL, NULL, NULL,
g_cclosure_marshal_VOID__UINT,
G_TYPE_NONE, 1, G_TYPE_UINT); G_TYPE_NONE, 1, G_TYPE_UINT);
g_type_class_add_private (klass, sizeof (GvcMixerControlPrivate)); g_type_class_add_private (klass, sizeof (GvcMixerControlPrivate));

3
src/tray/na-marshal.list
View File

@ -1,3 +0,0 @@
VOID:OBJECT,OBJECT
VOID:OBJECT,STRING,LONG,LONG
VOID:OBJECT,LONG

17
src/tray/na-tray-manager.c
View File

@ -34,8 +34,6 @@
#endif #endif
#include <gtk/gtk.h> #include <gtk/gtk.h>
#include "na-marshal.h"
/* Signals */ /* Signals */
enum enum
{ {
@ -143,8 +141,7 @@ na_tray_manager_class_init (NaTrayManagerClass *klass)
G_OBJECT_CLASS_TYPE (klass), G_OBJECT_CLASS_TYPE (klass),
G_SIGNAL_RUN_LAST, G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (NaTrayManagerClass, tray_icon_added), G_STRUCT_OFFSET (NaTrayManagerClass, tray_icon_added),
NULL, NULL, NULL, NULL, NULL,
g_cclosure_marshal_VOID__OBJECT,
G_TYPE_NONE, 1, G_TYPE_NONE, 1,
GTK_TYPE_SOCKET); GTK_TYPE_SOCKET);
@ -153,8 +150,7 @@ na_tray_manager_class_init (NaTrayManagerClass *klass)
G_OBJECT_CLASS_TYPE (klass), G_OBJECT_CLASS_TYPE (klass),
G_SIGNAL_RUN_LAST, G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (NaTrayManagerClass, tray_icon_removed), G_STRUCT_OFFSET (NaTrayManagerClass, tray_icon_removed),
NULL, NULL, NULL, NULL, NULL,
g_cclosure_marshal_VOID__OBJECT,
G_TYPE_NONE, 1, G_TYPE_NONE, 1,
GTK_TYPE_SOCKET); GTK_TYPE_SOCKET);
manager_signals[MESSAGE_SENT] = manager_signals[MESSAGE_SENT] =
@ -162,8 +158,7 @@ na_tray_manager_class_init (NaTrayManagerClass *klass)
G_OBJECT_CLASS_TYPE (klass), G_OBJECT_CLASS_TYPE (klass),
G_SIGNAL_RUN_LAST, G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (NaTrayManagerClass, message_sent), G_STRUCT_OFFSET (NaTrayManagerClass, message_sent),
NULL, NULL, NULL, NULL, NULL,
_na_marshal_VOID__OBJECT_STRING_LONG_LONG,
G_TYPE_NONE, 4, G_TYPE_NONE, 4,
GTK_TYPE_SOCKET, GTK_TYPE_SOCKET,
G_TYPE_STRING, G_TYPE_STRING,
@ -174,8 +169,7 @@ na_tray_manager_class_init (NaTrayManagerClass *klass)
G_OBJECT_CLASS_TYPE (klass), G_OBJECT_CLASS_TYPE (klass),
G_SIGNAL_RUN_LAST, G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (NaTrayManagerClass, message_cancelled), G_STRUCT_OFFSET (NaTrayManagerClass, message_cancelled),
NULL, NULL, NULL, NULL, NULL,
_na_marshal_VOID__OBJECT_LONG,
G_TYPE_NONE, 2, G_TYPE_NONE, 2,
GTK_TYPE_SOCKET, GTK_TYPE_SOCKET,
G_TYPE_LONG); G_TYPE_LONG);
@ -184,8 +178,7 @@ na_tray_manager_class_init (NaTrayManagerClass *klass)
G_OBJECT_CLASS_TYPE (klass), G_OBJECT_CLASS_TYPE (klass),
G_SIGNAL_RUN_LAST, G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (NaTrayManagerClass, lost_selection), G_STRUCT_OFFSET (NaTrayManagerClass, lost_selection),
NULL, NULL, NULL, NULL, NULL,
g_cclosure_marshal_VOID__VOID,
G_TYPE_NONE, 0); G_TYPE_NONE, 0);
#if defined (GDK_WINDOWING_X11) #if defined (GDK_WINDOWING_X11)