diff options
| author | Bastien Nocera <hadess@hadess.net> | 2016-11-02 17:40:02 +0100 |
|---|---|---|
| committer | Bastien Nocera <hadess@hadess.net> | 2016-11-02 18:32:00 +0100 |
| commit | 90e261f157e1c6898f0aed43b41efa5b79df3f49 (patch) | |
| tree | 0a48808b33283d3a89cce5b105d4cf57eb4e4f09 /gudev | |
| parent | 28e1a7210196632b9eaf93c2bf2b5b81a0975c32 (diff) | |
| download | libgudev-90e261f157e1c6898f0aed43b41efa5b79df3f49.tar.gz | |
gudev: Use generic marshaller
And require a newer glib for that functionality. glib 2.30 was released
in 2011, so seems new enough for us to make use of it.
Diffstat (limited to 'gudev')
| -rw-r--r-- | gudev/gudevclient.c | 3 | ||||
| -rw-r--r-- | gudev/gudevenumerator.c | 1 | ||||
| -rw-r--r-- | gudev/gudevmarshal.list | 1 |
3 files changed, 1 insertions, 4 deletions
diff --git a/gudev/gudevclient.c b/gudev/gudevclient.c index 8b9516c..587b57a 100644 --- a/gudev/gudevclient.c +++ b/gudev/gudevclient.c @@ -27,7 +27,6 @@ #include "gudevclient.h" #include "gudevdevice.h" -#include "gudevmarshal.h" #include "gudevprivate.h" /** @@ -297,7 +296,7 @@ g_udev_client_class_init (GUdevClientClass *klass) G_STRUCT_OFFSET (GUdevClientClass, uevent), NULL, NULL, - g_udev_marshal_VOID__STRING_OBJECT, + g_cclosure_marshal_generic, G_TYPE_NONE, 2, G_TYPE_STRING, diff --git a/gudev/gudevenumerator.c b/gudev/gudevenumerator.c index 1fb3098..e6cdc67 100644 --- a/gudev/gudevenumerator.c +++ b/gudev/gudevenumerator.c @@ -27,7 +27,6 @@ #include "gudevclient.h" #include "gudevenumerator.h" #include "gudevdevice.h" -#include "gudevmarshal.h" #include "gudevprivate.h" /** diff --git a/gudev/gudevmarshal.list b/gudev/gudevmarshal.list deleted file mode 100644 index 7e66599..0000000 --- a/gudev/gudevmarshal.list +++ /dev/null @@ -1 +0,0 @@ -VOID:STRING,OBJECT |