diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile.am | 12 | ||||
| -rw-r--r-- | src/plugin-marshal.list | 2 | ||||
| -rw-r--r-- | src/plugin.c | 4 | ||||
| -rw-r--r-- | src/sylpheed-marshal.list | 1 |
4 files changed, 15 insertions, 4 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index fbf28142..eda81c83 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -100,11 +100,14 @@ BUILT_SOURCES = \ quote_fmt_parse.c \ quote_fmt_parse.h \ sylpheed-marshal.c \ - sylpheed-marshal.h + sylpheed-marshal.h \ + plugin-marshal.c \ + plugin-marshal.h lib_LTLIBRARIES = libsylpheed-plugin-0.la libsylpheed_plugin_0_la_SOURCES = \ + plugin-marshal.c plugin-marshal.h \ plugin.c libsylpheed_plugin_0includedir=$(includedir)/sylpheed @@ -127,6 +130,7 @@ libsylpheed_plugin_0_la_LIBADD = \ EXTRA_DIST = \ quote_fmt_parse.h \ sylpheed-marshal.list \ + plugin-marshal.list \ version.h.in \ sylpheed.rc.in \ libsylpheed-plugin-0.def @@ -172,3 +176,9 @@ sylpheed-marshal.h: sylpheed-marshal.list sylpheed-marshal.c: sylpheed-marshal.list $(GLIB_GENMARSHAL) $< --body --prefix=sylpheed_marshal > $@ + +plugin-marshal.h: plugin-marshal.list + $(GLIB_GENMARSHAL) $< --header --prefix=syl_plugin_marshal > $@ + +plugin-marshal.c: plugin-marshal.list + $(GLIB_GENMARSHAL) $< --body --prefix=syl_plugin_marshal > $@ diff --git a/src/plugin-marshal.list b/src/plugin-marshal.list new file mode 100644 index 00000000..3eb1e2b6 --- /dev/null +++ b/src/plugin-marshal.list @@ -0,0 +1,2 @@ +VOID:POINTER +VOID:POINTER,POINTER,STRING,STRING,POINTER diff --git a/src/plugin.c b/src/plugin.c index 07f940ac..8b5ea643 100644 --- a/src/plugin.c +++ b/src/plugin.c @@ -24,7 +24,7 @@ #include "plugin.h" #include "utils.h" #include "folder.h" -#include "sylpheed-marshal.h" +#include "plugin-marshal.h" G_DEFINE_TYPE(SylPlugin, syl_plugin, G_TYPE_OBJECT); @@ -164,7 +164,7 @@ static void syl_plugin_class_init(SylPluginClass *klass) G_STRUCT_OFFSET(SylPluginClass, textview_menu_popup), NULL, NULL, - sylpheed_marshal_VOID__POINTER_POINTER_STRING_STRING_POINTER, + syl_plugin_marshal_VOID__POINTER_POINTER_STRING_STRING_POINTER, G_TYPE_NONE, 5, G_TYPE_POINTER, diff --git a/src/sylpheed-marshal.list b/src/sylpheed-marshal.list index c5eb054f..d0f15c78 100644 --- a/src/sylpheed-marshal.list +++ b/src/sylpheed-marshal.list @@ -1,3 +1,2 @@ VOID:POINTER VOID:INT,POINTER -VOID:POINTER,POINTER,STRING,STRING,POINTER |