colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

devices: fix the dbus glue naming inconsistency for NMDevice

Browse Source
This commit is contained in:
Dan Winship
2013-05-08 16:52:36 -04:00
parent 3ab82ea20e
commit 2a8023ef3d
2 changed files with 4 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/Makefile.am
View File

@@ -60,7 +60,7 @@ libNetworkManager_la_SOURCES = \
config/nm-config-device.c \ config/nm-config-device.c \
config/nm-config-device.h \ config/nm-config-device.h \
\ \
devices/nm-device-interface-glue.h \ devices/nm-device-glue.h \
devices/nm-device.c \ devices/nm-device.c \
devices/nm-device.h \ devices/nm-device.h \
devices/nm-device-adsl-glue.h \ devices/nm-device-adsl-glue.h \
@@ -317,17 +317,12 @@ if WITH_WEXT
libNetworkManager_la_SOURCES += wifi/wifi-utils-wext.c wifi/wifi-utils-wext.h libNetworkManager_la_SOURCES += wifi/wifi-utils-wext.c wifi/wifi-utils-wext.h
endif endif
# dbus-glib glue. We define nm-device-interface-glue.h specially, because its
# name doesn't match the general pattern.
devices/nm-device-interface-glue.h: $(top_srcdir)/introspection/nm-device.xml
$(AM_V_GEN) dbus-binding-tool --prefix=nm_device_interface --mode=glib-server --output=$@ $<
define glue_rule define glue_rule
$(1): $$(top_srcdir)/introspection/$(notdir $(subst -glue.h,,$(1))).xml $(1): $$(top_srcdir)/introspection/$(notdir $(subst -glue.h,,$(1))).xml
$$(AM_V_GEN) dbus-binding-tool --prefix=$(subst -,_,$(notdir $(subst -glue.h,,$(1)))) --mode=glib-server --output=$$@ $$< $$(AM_V_GEN) dbus-binding-tool --prefix=$(subst -,_,$(notdir $(subst -glue.h,,$(1)))) --mode=glib-server --output=$$@ $$<
endef endef
$(foreach f,$(filter-out devices/nm-device-interface-glue.h,$(filter %-glue.h,$(libNetworkManager_la_SOURCES))),$(eval $(call glue_rule,$(f)))) $(foreach f,$(filter %-glue.h,$(libNetworkManager_la_SOURCES)),$(eval $(call glue_rule,$(f))))
GLIB_GENERATED = nm-enum-types.h nm-enum-types.c GLIB_GENERATED = nm-enum-types.h nm-enum-types.c

4
src/devices/nm-device.c
View File

@@ -71,7 +71,7 @@
static void impl_device_disconnect (NMDevice *device, DBusGMethodInvocation *context); static void impl_device_disconnect (NMDevice *device, DBusGMethodInvocation *context);
#include "nm-device-interface-glue.h" #include "nm-device-glue.h"
#define PENDING_IP4_CONFIG "pending-ip4-config" #define PENDING_IP4_CONFIG "pending-ip4-config"
#define PENDING_IP6_CONFIG "pending-ip6-config" #define PENDING_IP6_CONFIG "pending-ip6-config"
@@ -5145,7 +5145,7 @@ nm_device_class_init (NMDeviceClass *klass)
G_TYPE_NONE, 2, G_TYPE_OBJECT, G_TYPE_OBJECT); G_TYPE_NONE, 2, G_TYPE_OBJECT, G_TYPE_OBJECT);
dbus_g_object_type_install_info (G_TYPE_FROM_CLASS (klass), dbus_g_object_type_install_info (G_TYPE_FROM_CLASS (klass),
&dbus_glib_nm_device_interface_object_info); &dbus_glib_nm_device_object_info);
dbus_g_error_domain_register (NM_DEVICE_ERROR, NULL, NM_TYPE_DEVICE_ERROR); dbus_g_error_domain_register (NM_DEVICE_ERROR, NULL, NM_TYPE_DEVICE_ERROR);
} }