This Just Works(tm). However, there is one ugly part worth calling
out - we're still calling dbus_g_object_register_marshaller(). In the
future, that won't be necessary with:
See https://bugs.freedesktop.org/show_bug.cgi?id=64214
---
.gitignore |1 -
src/bluez-manager/nm-bluez-device.c |3 +--
src/bluez-manager/nm-bluez-manager.c |5 ++---
src/dhcp-manager/nm-dhcp-manager.c |1 -
src/generated/Makefile.am|7 +--
src/ip6-manager/nm-ip6-manager.c |5 ++---
src/modem-manager/nm-modem-generic.c |3 +--
src/modem-manager/nm-modem-manager.c |3 +--
src/modem-manager/nm-modem.c |7 +++
src/nm-dbus-manager.c|9 -
src/nm-device-bt.c |5 ++---
src/nm-device-modem.c|1 -
src/nm-device-wifi.c |3 +--
src/nm-device.c | 11 +--
src/nm-manager.c |3 +--
src/nm-udev-manager.c|5 ++---
src/platform/nm-platform.c |3 +--
src/ppp-manager/nm-ppp-manager.c |5 ++---
src/settings/nm-default-wired-connection.c |1 -
src/settings/nm-inotify-helper.c |3 +--
src/settings/nm-settings-connection.c|1 -
src/supplicant-manager/nm-supplicant-interface.c | 17 -
src/vpn-manager/nm-vpn-connection.c |5 ++---
src/vpn-manager/nm-vpn-manager.c |1 -
24 files changed, 40 insertions(+), 68 deletions(-)
From d3df947623f1f2d8487f0792a3e0981228e1ae89 Mon Sep 17 00:00:00 2001
From: Colin Walters walt...@verbum.org
Date: Wed, 8 May 2013 08:53:59 -0400
Subject: [PATCH] Use g_cclosure_marshal_generic
This Just Works(tm). However, there is one ugly part worth calling
out - we're still calling dbus_g_object_register_marshaller(). In the
future, that won't be necessary with:
See https://bugs.freedesktop.org/show_bug.cgi?id=64214
---
.gitignore |1 -
src/bluez-manager/nm-bluez-device.c |3 +--
src/bluez-manager/nm-bluez-manager.c |5 ++---
src/dhcp-manager/nm-dhcp-manager.c |1 -
src/generated/Makefile.am|7 +--
src/ip6-manager/nm-ip6-manager.c |5 ++---
src/modem-manager/nm-modem-generic.c |3 +--
src/modem-manager/nm-modem-manager.c |3 +--
src/modem-manager/nm-modem.c |7 +++
src/nm-dbus-manager.c|9 -
src/nm-device-bt.c |5 ++---
src/nm-device-modem.c|1 -
src/nm-device-wifi.c |3 +--
src/nm-device.c | 11 +--
src/nm-manager.c |3 +--
src/nm-udev-manager.c|5 ++---
src/platform/nm-platform.c |3 +--
src/ppp-manager/nm-ppp-manager.c |5 ++---
src/settings/nm-default-wired-connection.c |1 -
src/settings/nm-inotify-helper.c |3 +--
src/settings/nm-settings-connection.c|1 -
src/supplicant-manager/nm-supplicant-interface.c | 17 -
src/vpn-manager/nm-vpn-connection.c |5 ++---
src/vpn-manager/nm-vpn-manager.c |1 -
24 files changed, 40 insertions(+), 68 deletions(-)
diff --git a/.gitignore b/.gitignore
index 3b9d587..8c8da45 100644
--- a/.gitignore
+++ b/.gitignore
@@ -160,7 +160,6 @@ libnm-glib/libnm-glib-test
libnm-glib/nm-glib-marshal.*
src/NetworkManager
src/nm-crash-logger
-src/generated/nm-marshal.*
src/supplicant-manager/tests/test-supplicant-config
src/dhcp-manager/nm-dhcp-helper
system-settings/src
diff --git a/src/bluez-manager/nm-bluez-device.c b/src/bluez-manager/nm-bluez-device.c
index b12a861..9b593a4 100644
--- a/src/bluez-manager/nm-bluez-device.c
+++ b/src/bluez-manager/nm-bluez-device.c
@@ -31,7 +31,6 @@
#include nm-bluez-common.h
#include nm-dbus-glib-types.h
#include nm-logging.h
-#include nm-marshal.h
G_DEFINE_TYPE (NMBluezDevice, nm_bluez_device, G_TYPE_OBJECT)
@@ -424,7 +423,7 @@ nm_bluez_device_new (const char *path, NMConnectionProvider *provider)
BLUEZ_DEVICE_INTERFACE);
g_object_unref (dbus_mgr);
- dbus_g_object_register_marshaller (_nm_marshal_VOID__STRING_BOXED,
+ dbus_g_object_register_marshaller (NULL,
G_TYPE_NONE,
G_TYPE_STRING, G_TYPE_VALUE,
G_TYPE_INVALID
