gplugin/gplugin

Remove all the marshaller generating code and it's not needed anymore
auto-marshallers
2019-07-19, Gary Kramlich
06e4e9a6697d
Parents 1a6908462ac7
Children 569497519a39
Remove all the marshaller generating code and it's not needed anymore
4 files changed, 10 insertions(+), 31 deletions(-)
  • +5 -6
    gplugin/gplugin-manager.c
  • +0 -4
    gplugin/gplugin-marshallers.list
  • +5 -4
    gplugin/gplugin-plugin.c
  • +0 -17
    gplugin/meson.build
    • --- a/gplugin/gplugin-manager.c Thu Jul 18 01:13:19 2019 +0000
    +++ b/gplugin/gplugin-manager.c Fri Jul 19 06:38:41 2019 -0500
    @@ -23,7 +23,6 @@
    #include <gplugin/gplugin-manager.h>
    #include <gplugin/gplugin-core.h>
    -#include <gplugin/gplugin-marshallers.h>
    #include <gplugin/gplugin-private.h>
    @@ -966,7 +965,7 @@
    G_STRUCT_OFFSET(GPluginManagerClass,
    loading_plugin),
    gplugin_boolean_accumulator, NULL,
    - gplugin_marshal_BOOLEAN__OBJECT_POINTER,
    + NULL,
    G_TYPE_BOOLEAN,
    2,
    G_TYPE_OBJECT, G_TYPE_POINTER);
    @@ -986,7 +985,7 @@
    G_STRUCT_OFFSET(GPluginManagerClass,
    loaded_plugin),
    NULL, NULL,
    - gplugin_marshal_VOID__OBJECT,
    + NULL,
    G_TYPE_NONE,
    1,
    G_TYPE_OBJECT);
    @@ -1005,7 +1004,7 @@
    G_STRUCT_OFFSET(GPluginManagerClass, load_failed),
    NULL,
    NULL,
    - gplugin_marshal_VOID__OBJECT,
    + NULL,
    G_TYPE_NONE,
    1,
    G_TYPE_OBJECT);
    @@ -1026,7 +1025,7 @@
    G_STRUCT_OFFSET(GPluginManagerClass,
    unloading_plugin),
    gplugin_boolean_accumulator, NULL,
    - gplugin_marshal_BOOLEAN__OBJECT_POINTER,
    + NULL,
    G_TYPE_BOOLEAN,
    2,
    G_TYPE_OBJECT, G_TYPE_POINTER);
    @@ -1046,7 +1045,7 @@
    G_STRUCT_OFFSET(GPluginManagerClass,
    unloaded_plugin),
    NULL, NULL,
    - gplugin_marshal_VOID__OBJECT,
    + NULL,
    G_TYPE_NONE,
    1,
    G_TYPE_OBJECT);
    --- a/gplugin/gplugin-marshallers.list Thu Jul 18 01:13:19 2019 +0000
    +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
    @@ -1,4 +0,0 @@
    -BOOLEAN:OBJECT,POINTER
    -VOID:ENUM,ENUM
    -VOID:INT,INT
    -VOID:OBJECT
    --- a/gplugin/gplugin-plugin.c Thu Jul 18 01:13:19 2019 +0000
    +++ b/gplugin/gplugin-plugin.c Fri Jul 19 06:38:41 2019 -0500
    @@ -18,7 +18,6 @@
    #include <gplugin/gplugin-plugin.h>
    #include <gplugin/gplugin-enums.h>
    -#include <gplugin/gplugin-marshallers.h>
    #include <gplugin/gplugin-private.h>
    /**
    @@ -128,11 +127,13 @@
    GPLUGIN_TYPE_PLUGIN,
    G_SIGNAL_RUN_LAST,
    G_STRUCT_OFFSET(GPluginPluginInterface, state_changed),
    - NULL, NULL,
    - gplugin_marshal_VOID__ENUM_ENUM,
    + NULL,
    + NULL,
    + NULL,
    G_TYPE_NONE,
    2,
    - GPLUGIN_TYPE_PLUGIN_STATE, GPLUGIN_TYPE_PLUGIN_STATE);
    + GPLUGIN_TYPE_PLUGIN_STATE,
    + GPLUGIN_TYPE_PLUGIN_STATE);
    }
    /******************************************************************************
    --- a/gplugin/meson.build Thu Jul 18 01:13:19 2019 +0000
    +++ b/gplugin/meson.build Fri Jul 19 06:38:41 2019 -0500
    @@ -83,23 +83,6 @@
    enums_c
    ]
    -###############################################################################
    -# gplugin-marshallers.[ch] generation
    -###############################################################################
    -marshallers = gnome.genmarshal('gplugin-marshallers',
    - sources : 'gplugin-marshallers.list',
    - prefix : 'gplugin_marshal')
    -marshallers_c = marshallers[0]
    -marshallers_h = marshallers[1]
    -
    -GPLUGIN_PRIVATE_BUILT_HEADERS += [
    - marshallers_h
    -]
    -
    -GPLUGIN_PRIVATE_BUILT_SOURCES += [
    - marshallers_c
    -]
    -
    ##############################################################################
    # Helper Variables
    ###############################################################################