diff options
| author | Javier Jardón <jjardon@gnome.org> | 2012-11-23 11:34:54 +0900 |
|---|---|---|
| committer | Javier Jardón <jjardon@gnome.org> | 2012-12-10 03:09:57 +0900 |
| commit | de8ec4ad07c48d572ccc8af4f347a37afa22f9f5 (patch) | |
| tree | 32eced4af60447e3c2e9ec6bc821d6b707b9e38c /browser-plugin | |
| parent | ec1f7869da72be6c7f16feef37c20e73db11c7ea (diff) | |
| download | totem-de8ec4ad07c48d572ccc8af4f347a37afa22f9f5.tar.gz | |
Use g_cclosure_marshal_generic() instead custom marshallers
Diffstat (limited to 'browser-plugin')
| -rw-r--r-- | browser-plugin/Makefile.am | 15 | ||||
| -rw-r--r-- | browser-plugin/marshal.list | 3 | ||||
| -rw-r--r-- | browser-plugin/totem-plugin-viewer.c | 7 |
3 files changed, 4 insertions, 21 deletions
diff --git a/browser-plugin/Makefile.am b/browser-plugin/Makefile.am index 52bcd139d..60798d660 100644 --- a/browser-plugin/Makefile.am +++ b/browser-plugin/Makefile.am @@ -47,19 +47,6 @@ plugin_ldflags = \ -no-undefined \ $(AM_LDFLAGS) -# Marshaller -MARSHAL_FILES = \ - marshal.h \ - marshal.c - -marshal.h: marshal.list - $(AM_V_GEN)($(GLIB_GENMARSHAL) --prefix=totempluginviewer_marshal --internal --header $< > $@) -marshal.c: marshal.list marshal.h - $(AM_V_GEN)($(GLIB_GENMARSHAL) --prefix=totempluginviewer_marshal --internal --body --header $< > $@) - -CLEANFILES = $(MARSHAL_FILES) -EXTRA_DIST += marshal.list - # The Glow button test program noinst_PROGRAMS = test-glow-button @@ -112,7 +99,7 @@ totem_plugin_viewer_LDFLAGS = -export-dynamic totem-plugin-viewer-interface.h: org_gnome_totem_PluginViewer.xml $(DBUS_BIND) --prefix=totem_embedded --mode=glib-server $< > $@ -CLEANFILES += totem-plugin-viewer-interface.h +CLEANFILES = totem-plugin-viewer-interface.h EXTRA_DIST += org_gnome_totem_PluginViewer.xml # Totem GMP Plugin diff --git a/browser-plugin/marshal.list b/browser-plugin/marshal.list deleted file mode 100644 index 35b4fa7f6..000000000 --- a/browser-plugin/marshal.list +++ /dev/null @@ -1,3 +0,0 @@ -VOID:UINT,UINT -VOID:UINT,UINT,STRING -VOID:STRING,BOXED diff --git a/browser-plugin/totem-plugin-viewer.c b/browser-plugin/totem-plugin-viewer.c index d46e93632..9ea736156 100644 --- a/browser-plugin/totem-plugin-viewer.c +++ b/browser-plugin/totem-plugin-viewer.c @@ -53,7 +53,6 @@ #include "totem-plugin-viewer-constants.h" #include "totem-plugin-viewer-options.h" -#include "marshal.h" GtkWidget *totem_statusbar_create (void); GtkWidget *totem_volume_create (void); @@ -241,7 +240,7 @@ static void totem_embedded_class_init (TotemEmbeddedClass *klass) G_SIGNAL_RUN_LAST, NULL /* class closure */, NULL /* accu */, NULL /* accu data */, - totempluginviewer_marshal_VOID__UINT_UINT, + g_cclosure_marshal_generic, G_TYPE_NONE, 2, param_types); signals[START_STREAM] = g_signal_newv ("start-stream", @@ -267,7 +266,7 @@ static void totem_embedded_class_init (TotemEmbeddedClass *klass) G_SIGNAL_RUN_LAST, NULL /* class closure */, NULL /* accu */, NULL /* accu data */, - totempluginviewer_marshal_VOID__UINT_UINT_STRING, + g_cclosure_marshal_generic, G_TYPE_NONE, 3, param_types); signals[PROPERTY_CHANGE] = g_signal_new ("property-change", @@ -275,7 +274,7 @@ static void totem_embedded_class_init (TotemEmbeddedClass *klass) G_SIGNAL_RUN_LAST, 0 /* class offset */, NULL /* accu */, NULL /* accu data */, - totempluginviewer_marshal_VOID__STRING_BOXED, + g_cclosure_marshal_generic, G_TYPE_NONE, 2, G_TYPE_STRING, G_TYPE_VALUE); } |