diff options
39 files changed, 41 insertions, 181 deletions
diff --git a/.gitignore b/.gitignore index 14a033232e..59dc2dee30 100644 --- a/.gitignore +++ b/.gitignore @@ -31,7 +31,6 @@ cscope.*out valgrind-*.log test-*.log test-*.trs -*-glue.h /ABOUT-NLS /COPYING @@ -156,6 +155,8 @@ test-*.trs /libnm-core/tests/test-setting-8021x /libnm-core/tests/test-setting-dcb +/libnm-glib/nm-secret-agent-glue.h +/libnm-glib/nm-vpn-plugin-glue.h /libnm-glib/libnm-glib-test /libnm-glib/tests/test-nm-client /libnm-glib/tests/test-remote-settings-client diff --git a/callouts/Makefile.am b/callouts/Makefile.am index 7bc7273032..1f89356fa3 100644 --- a/callouts/Makefile.am +++ b/callouts/Makefile.am @@ -5,7 +5,6 @@ AM_CPPFLAGS = \ -I${top_srcdir}/libnm-core \ -I${top_builddir}/libnm-core \ $(GLIB_CFLAGS) \ - $(DBUS_CFLAGS) \ -DNETWORKMANAGER_COMPILATION \ -DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \ -DNMCONFDIR=\"$(nmconfdir)\" \ diff --git a/callouts/tests/Makefile.am b/callouts/tests/Makefile.am index a0ed40159f..9e851805a0 100644 --- a/callouts/tests/Makefile.am +++ b/callouts/tests/Makefile.am @@ -9,8 +9,7 @@ AM_CPPFLAGS = \ -DNETWORKMANAGER_COMPILATION \ -DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \ -DSRCDIR=\"$(abs_srcdir)\" \ - $(GLIB_CFLAGS) \ - $(DBUS_CFLAGS) + $(GLIB_CFLAGS) noinst_PROGRAMS = \ test-dispatcher-envp @@ -23,8 +22,7 @@ test_dispatcher_envp_SOURCES = \ test_dispatcher_envp_LDADD = \ $(top_builddir)/libnm/libnm.la \ $(top_builddir)/callouts/libtest-dispatcher-envp.la \ - $(GLIB_LIBS) \ - $(DBUS_LIBS) + $(GLIB_LIBS) ########################################### diff --git a/configure.ac b/configure.ac index 9fce12bb4d..aad7f4c6f3 100644 --- a/configure.ac +++ b/configure.ac @@ -273,20 +273,6 @@ dnl Checks for dbus-glib dnl PKG_CHECK_MODULES(DBUS, dbus-1 >= 1.1 dbus-glib-1 >= 0.94) -AC_CHECK_LIB([dbus-glib-1], [dbus_g_method_invocation_get_g_connection], ac_have_gmi_get_con="1", ac_have_gmi_get_con="0") -AC_DEFINE_UNQUOTED(HAVE_DBUS_GLIB_GMI_GET_CONNECTION, $ac_have_gmi_get_con, [Define if you have a dbus-glib with dbus_g_method_invocation_get_g_connection()]) - -dnl -dnl Only dbus-glib >= 0.100 can use private dbus connections -dnl -PKG_CHECK_MODULES(DBUS_GLIB_100, [dbus-glib-1 >= 0.100], [have_dbus_glib_100=yes],[have_dbus_glib_100=no]) -if (test "${have_dbus_glib_100}" = "yes"); then - AC_DEFINE(HAVE_DBUS_GLIB_100, 1, [Define if you have dbus-glib >= 0.100]) -else - AC_DEFINE(HAVE_DBUS_GLIB_100, 0, [Define if you have dbus-glib >= 0.100]) -fi -AM_CONDITIONAL(HAVE_DBUS_GLIB_100, test "${have_dbus_glib_100}" = "yes") - PKG_CHECK_MODULES(GLIB, [gio-unix-2.0 >= 2.37.6 gmodule-2.0], [AC_SUBST(LOG_DRIVER, '$(top_srcdir)/build-aux/tap-driver.sh'), AC_SUBST(AM_TESTS_FD_REDIRECT, '--tap')], diff --git a/include/Makefile.am b/include/Makefile.am index b9b80cb024..2ebd172838 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -1,10 +1,8 @@ EXTRA_DIST = \ gsystem-local-alloc.h \ nm-dbus-compat.h \ - nm-dbus-glib-types.h \ nm-default.h \ nm-glib.h \ - nm-gvaluearray-compat.h \ nm-test-utils.h \ nm-macros-internal.h diff --git a/include/nm-glib.h b/include/nm-glib.h index 9b57c61331..9a5bc058e2 100644 --- a/include/nm-glib.h +++ b/include/nm-glib.h @@ -38,9 +38,6 @@ #endif - -#include "nm-gvaluearray-compat.h" - static inline void __g_type_ensure (GType type) { diff --git a/libnm-util/Makefile.am b/libnm-util/Makefile.am index d7d3ba8206..14c6ccacb6 100644 --- a/libnm-util/Makefile.am +++ b/libnm-util/Makefile.am @@ -62,9 +62,11 @@ nodist_libnm_util_include_HEADERS = \ libnm_util_la_private_headers = \ crypto.h \ + nm-dbus-glib-types.h \ + nm-gvaluearray-compat.h \ nm-param-spec-specialized.h \ - nm-utils-private.h \ - nm-setting-private.h + nm-setting-private.h \ + nm-utils-private.h libnm_util_la_csources = \ crypto.c \ diff --git a/include/nm-dbus-glib-types.h b/libnm-util/nm-dbus-glib-types.h index ad11ab6812..ad11ab6812 100644 --- a/include/nm-dbus-glib-types.h +++ b/libnm-util/nm-dbus-glib-types.h diff --git a/include/nm-gvaluearray-compat.h b/libnm-util/nm-gvaluearray-compat.h index 424e6be78d..424e6be78d 100644 --- a/include/nm-gvaluearray-compat.h +++ b/libnm-util/nm-gvaluearray-compat.h diff --git a/libnm-util/nm-param-spec-specialized.c b/libnm-util/nm-param-spec-specialized.c index 50903b067d..7f242acfca 100644 --- a/libnm-util/nm-param-spec-specialized.c +++ b/libnm-util/nm-param-spec-specialized.c @@ -23,6 +23,7 @@ #include "config.h" #include "nm-default.h" +#include "nm-gvaluearray-compat.h" #include "nm-param-spec-specialized.h" struct _NMParamSpecSpecialized { diff --git a/libnm-util/nm-utils.c b/libnm-util/nm-utils.c index ab19f2a68d..1659a1a3c9 100644 --- a/libnm-util/nm-utils.c +++ b/libnm-util/nm-utils.c @@ -30,6 +30,7 @@ #include <gmodule.h> #include "nm-default.h" +#include "nm-gvaluearray-compat.h" #include "nm-utils.h" #include "nm-utils-private.h" #include "nm-dbus-glib-types.h" diff --git a/libnm-util/nm-value-transforms.c b/libnm-util/nm-value-transforms.c index cc7bc50bfa..fd4aaf6069 100644 --- a/libnm-util/nm-value-transforms.c +++ b/libnm-util/nm-value-transforms.c @@ -24,6 +24,7 @@ #include <string.h> #include "nm-default.h" +#include "nm-gvaluearray-compat.h" #include "nm-utils.h" #include "nm-utils-private.h" #include "nm-dbus-glib-types.h" diff --git a/libnm-util/tests/test-general.c b/libnm-util/tests/test-general.c index 73c9dd8b5d..2dfa0b6dc1 100644 --- a/libnm-util/tests/test-general.c +++ b/libnm-util/tests/test-general.c @@ -30,6 +30,7 @@ #include <nm-utils.h> #include "nm-default.h" +#include "nm-gvaluearray-compat.h" #include "nm-setting-private.h" #include "nm-setting-connection.h" diff --git a/src/Makefile.am b/src/Makefile.am index fbd64722ec..0a60fb9745 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -33,6 +33,7 @@ endif AM_CPPFLAGS = \ -I$(top_srcdir)/include \ + -I$(top_builddir)/introspection \ -I$(top_srcdir)/libnm-core \ -I$(top_builddir)/libnm-core \ -I$(top_srcdir)/callouts \ @@ -190,7 +191,7 @@ nm_dhcp_client_headers = \ dhcp-manager/nm-dhcp-dhcpcd.h \ dhcp-manager/nm-dhcp-systemd.h -nm_sources = \ +libNetworkManager_la_SOURCES = \ $(nm_device_headers) \ $(nm_dhcp_client_headers) \ devices/nm-device.c \ @@ -362,14 +363,14 @@ nm_sources = \ if SUSPEND_RESUME_UPOWER -nm_sources += nm-sleep-monitor-upower.c +libNetworkManager_la_SOURCES += nm-sleep-monitor-upower.c else # systemd/consolekit suspend/resume used whenever upower is not enabled -nm_sources += nm-sleep-monitor-systemd.c +libNetworkManager_la_SOURCES += nm-sleep-monitor-systemd.c endif if WITH_WEXT -nm_sources += \ +libNetworkManager_la_SOURCES += \ platform/wifi/wifi-utils-wext.c \ platform/wifi/wifi-utils-wext.h endif @@ -378,45 +379,11 @@ endif GLIB_GENERATED = nm-enum-types.h nm-enum-types.c GLIB_MKENUMS_H_FLAGS = --identifier-prefix NM --fhead '\#include <nm-core-enum-types.h>\n' GLIB_MKENUMS_C_FLAGS = --identifier-prefix NM -nm_enum_types_sources = $(nm_sources) +nm_enum_types_sources = $(libNetworkManager_la_SOURCES) BUILT_SOURCES = $(GLIB_GENERATED) - -glue_sources = \ - nm-access-point-glue.h \ - nm-active-connection-glue.h \ - nm-agent-manager-glue.h \ - nm-device-bond-glue.h \ - nm-device-bridge-glue.h \ - nm-device-ethernet-glue.h \ - nm-device-generic-glue.h \ - nm-device-glue.h \ - nm-device-gre-glue.h \ - nm-device-infiniband-glue.h \ - nm-device-macvlan-glue.h \ - nm-device-tun-glue.h \ - nm-device-veth-glue.h \ - nm-device-vlan-glue.h \ - nm-device-vxlan-glue.h \ - nm-dhcp4-config-glue.h \ - nm-dhcp6-config-glue.h \ - nm-ip4-config-glue.h \ - nm-ip6-config-glue.h \ - nm-manager-glue.h \ - nm-ppp-manager-glue.h \ - nm-settings-connection-glue.h \ - nm-settings-glue.h \ - nm-vpn-connection-glue.h - -BUILT_SOURCES += $(glue_sources) - -%-glue.h: $(top_srcdir)/introspection/%.xml - $(AM_V_GEN) dbus-binding-tool --prefix=$(subst -,_,$(subst -glue.h,,$@)) --mode=glib-server --output=$@ $< - - AM_CPPFLAGS += \ - $(DBUS_CFLAGS) \ $(GLIB_CFLAGS) \ $(GUDEV_CFLAGS) \ $(LIBNL_CFLAGS) \ @@ -450,14 +417,10 @@ AM_CPPFLAGS += \ \ $(NULL) -libNetworkManager_la_SOURCES = \ - $(nm_sources) \ - $(glue_sources) - libNetworkManager_la_LIBADD = \ $(top_builddir)/libnm-core/libnm-core.la \ + $(top_builddir)/introspection/libnmdbus.la \ libsystemd-nm.la \ - $(DBUS_LIBS) \ $(GLIB_LIBS) \ $(GUDEV_LIBS) \ $(LIBNL_LIBS) \ @@ -533,8 +496,8 @@ endif libnm_iface_helper_la_LIBADD = \ $(top_builddir)/libnm-core/libnm-core.la \ + $(top_builddir)/introspection/libnmdbus.la \ libsystemd-nm.la \ - $(DBUS_LIBS) \ $(GLIB_LIBS) \ $(GUDEV_LIBS) \ $(LIBNL_LIBS) \ @@ -555,7 +518,6 @@ nm_iface_helper_LDADD = \ $(top_builddir)/libnm-core/libnm-core.la \ libsystemd-nm.la \ libnm-iface-helper.la \ - $(DBUS_LIBS) \ $(GLIB_LIBS) \ $(GUDEV_LIBS) \ $(SYSTEMD_JOURNAL_LIBS) \ @@ -582,8 +544,4 @@ install-data-hook: $(mkinstalldirs) -m 0755 $(DESTDIR)$(pkglibdir) CLEANFILES = \ - $(BUILT_SOURCES) \ - settings/*-glue.h \ - devices/*-glue.h \ - devices/*/*-glue.h - + $(BUILT_SOURCES) diff --git a/src/NetworkManagerUtils.c b/src/NetworkManagerUtils.c index bab2755743..eae6812f63 100644 --- a/src/NetworkManagerUtils.c +++ b/src/NetworkManagerUtils.c @@ -44,7 +44,6 @@ #include "nm-setting-wireless.h" #include "nm-setting-wireless-security.h" #include "nm-auth-utils.h" -#include "nm-dbus-glib-types.h" /* * Some toolchains (E.G. uClibc 0.9.33 and earlier) don't export @@ -2891,47 +2890,6 @@ nm_utils_ipv6_interface_identfier_get_from_addr (NMUtilsIPv6IfaceId *iid, } /** - * nm_utils_connection_hash_to_dict: - * @hash: a hashed #NMConnection - * - * Returns: a (floating) #GVariant equivalent to @hash. - */ -GVariant * -nm_utils_connection_hash_to_dict (GHashTable *hash) -{ - GValue val = { 0, }; - GVariant *variant; - - if (!hash) - return NULL; - - g_value_init (&val, DBUS_TYPE_G_MAP_OF_MAP_OF_VARIANT); - g_value_set_boxed (&val, hash); - variant = dbus_g_value_build_g_variant (&val); - g_value_unset (&val); - - return variant; -} - -/** - * nm_utils_connection_dict_to_hash: - * @dict: a #GVariant-serialized #NMConnection - * - * Returns: a #GHashTable equivalent to @dict. - */ -GHashTable * -nm_utils_connection_dict_to_hash (GVariant *dict) -{ - GValue val = { 0, }; - - if (!dict) - return NULL; - - dbus_g_value_parse_g_variant (dict, &val); - return g_value_get_boxed (&val); -} - -/** * nm_utils_setpgid: * @unused: unused * @@ -2963,9 +2921,9 @@ nm_utils_g_value_set_object_path (GValue *value, gpointer object) g_return_if_fail (!object || NM_IS_EXPORTED_OBJECT (object)); if (object && nm_exported_object_is_exported (object)) - g_value_set_boxed (value, nm_exported_object_get_path (object)); + g_value_set_string (value, nm_exported_object_get_path (object)); else - g_value_set_boxed (value, "/"); + g_value_set_string (value, "/"); } /** @@ -2989,7 +2947,8 @@ nm_utils_g_value_set_object_path_array (GValue *value, GSList *objects) continue; g_ptr_array_add (paths, g_strdup (nm_exported_object_get_path (object))); } - g_value_take_boxed (value, paths); + g_ptr_array_add (paths, NULL); + g_value_take_boxed (value, (char **) g_ptr_array_free (paths, FALSE)); } /** diff --git a/src/NetworkManagerUtils.h b/src/NetworkManagerUtils.h index a5a0563ba6..0d47bce9b6 100644 --- a/src/NetworkManagerUtils.h +++ b/src/NetworkManagerUtils.h @@ -224,9 +224,6 @@ void nm_utils_ipv6_addr_set_interface_identfier (struct in6_addr *addr, void nm_utils_ipv6_interface_identfier_get_from_addr (NMUtilsIPv6IfaceId *iid, const struct in6_addr *addr); -GVariant *nm_utils_connection_hash_to_dict (GHashTable *hash); -GHashTable *nm_utils_connection_dict_to_hash (GVariant *dict); - void nm_utils_array_remove_at_indexes (GArray *array, const guint *indexes_to_delete, gsize len); void nm_utils_setpgid (gpointer unused); diff --git a/src/dhcp-manager/tests/Makefile.am b/src/dhcp-manager/tests/Makefile.am index 8fec6972c2..16a11db3ba 100644 --- a/src/dhcp-manager/tests/Makefile.am +++ b/src/dhcp-manager/tests/Makefile.am @@ -9,7 +9,6 @@ AM_CPPFLAGS = \ -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \ -DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \ $(GLIB_CFLAGS) \ - $(DBUS_CFLAGS) \ -DTESTDIR="\"$(abs_srcdir)\"" noinst_PROGRAMS = \ diff --git a/src/main.c b/src/main.c index 4f83f849ba..59d39f763a 100644 --- a/src/main.c +++ b/src/main.c @@ -21,9 +21,6 @@ #include "config.h" -#include <dbus/dbus.h> -#include <dbus/dbus-glib-lowlevel.h> -#include <dbus/dbus-glib.h> #include <getopt.h> #include <locale.h> #include <errno.h> @@ -401,13 +398,6 @@ main (int argc, char *argv[]) } g_clear_error (&error); - dbus_threads_init_default (); - - /* Ensure that non-exported properties don't leak out, and that the - * introspection 'access' permissions are respected. - */ - dbus_glib_global_set_disable_legacy_property_access (); - nm_log_info (LOGD_CORE, "Read config: %s", nm_config_data_get_config_description (nm_config_get_data (config))); nm_config_data_log (nm_config_get_data (config), "CONFIG: "); nm_log_dbg (LOGD_CORE, "WEXT support is %s", @@ -427,12 +417,7 @@ main (int argc, char *argv[]) wimax_enabled); if (!nm_bus_manager_get_connection (nm_bus_manager_get ())) { -#if HAVE_DBUS_GLIB_100 nm_log_warn (LOGD_CORE, "Failed to connect to D-Bus; only private bus is available"); -#else - nm_log_err (LOGD_CORE, "Failed to connect to D-Bus, exiting..."); - goto done; -#endif } else { /* Start our DBus service */ if (!nm_bus_manager_start_service (nm_bus_manager_get ())) { diff --git a/src/nm-auth-subject.c b/src/nm-auth-subject.c index 5e2eaa7250..c4b6e579ac 100644 --- a/src/nm-auth-subject.c +++ b/src/nm-auth-subject.c @@ -167,9 +167,9 @@ nm_auth_subject_get_unix_process_dbus_sender (NMAuthSubject *subject) /**************************************************************/ static NMAuthSubject * -_new_unix_process (DBusGMethodInvocation *context, - DBusConnection *connection, - DBusMessage *message) +_new_unix_process (GDBusMethodInvocation *context, + GDBusConnection *connection, + GDBusMessage *message) { NMAuthSubject *self; gboolean success = FALSE; @@ -221,14 +221,14 @@ _new_unix_process (DBusGMethodInvocation *context, } NMAuthSubject * -nm_auth_subject_new_unix_process_from_context (DBusGMethodInvocation *context) +nm_auth_subject_new_unix_process_from_context (GDBusMethodInvocation *context) { return _new_unix_process (context, NULL, NULL); } NMAuthSubject * -nm_auth_subject_new_unix_process_from_message (DBusConnection *connection, - DBusMessage *message) +nm_auth_subject_new_unix_process_from_message (GDBusConnection *connection, + GDBusMessage *message) { return _new_unix_process (NULL, connection, message); } diff --git a/src/nm-auth-subject.h b/src/nm-auth-subject.h index 3205ced720..1682ba7f1a 100644 --- a/src/nm-auth-subject.h +++ b/src/nm-auth-subject.h @@ -22,8 +22,6 @@ #define __NETWORKMANAGER_AUTH_SUBJECT_H__ #include "config.h" -#include <dbus/dbus.h> -#include <dbus/dbus-glib.h> #include "nm-default.h" @@ -57,9 +55,9 @@ GType nm_auth_subject_get_type (void); NMAuthSubject *nm_auth_subject_new_internal (void); -NMAuthSubject *nm_auth_subject_new_unix_process_from_context (DBusGMethodInvocation *context); +NMAuthSubject *nm_auth_subject_new_unix_process_from_context (GDBusMethodInvocation *context); -NMAuthSubject *nm_auth_subject_new_unix_process_from_message (DBusConnection *connection, DBusMessage *message); +NMAuthSubject *nm_auth_subject_new_unix_process_from_message (GDBusConnection *connection, GDBusMessage *message); NMAuthSubjectType nm_auth_subject_get_subject_type (NMAuthSubject *subject); diff --git a/src/nm-auth-utils.c b/src/nm-auth-utils.c index 969accb7ba..1ed01b6c8d 100644 --- a/src/nm-auth-utils.c +++ b/src/nm-auth-utils.c @@ -34,7 +34,7 @@ struct NMAuthChain { GSList *calls; GHashTable *data; - DBusGMethodInvocation *context; + GDBusMethodInvocation *context; NMAuthSubject *subject; GError *error; @@ -83,7 +83,7 @@ auth_chain_finish (gpointer user_data) /* Creates the NMAuthSubject automatically */ NMAuthChain * -nm_auth_chain_new_context (DBusGMethodInvocation *context, +nm_auth_chain_new_context (GDBusMethodInvocation *context, NMAuthChainResultFunc done_func, gpointer user_data) { @@ -107,7 +107,7 @@ nm_auth_chain_new_context (DBusGMethodInvocation *context, /* Requires an NMAuthSubject */ NMAuthChain * nm_auth_chain_new_subject (NMAuthSubject *subject, - DBusGMethodInvocation *context, + GDBusMethodInvocation *context, NMAuthChainResultFunc done_func, gpointer user_data) { diff --git a/src/nm-auth-utils.h b/src/nm-auth-utils.h index 4071b12154..c6cad52a6d 100644 --- a/src/nm-auth-utils.h +++ b/src/nm-auth-utils.h @@ -21,8 +21,6 @@ #ifndef __NETWORKMANAGER_MANAGER_AUTH_H__ #define __NETWORKMANAGER_MANAGER_AUTH_H__ -#include <dbus/dbus-glib.h> - #include <nm-connection.h> #include "nm-default.h" @@ -50,15 +48,15 @@ typedef enum { typedef void (*NMAuthChainResultFunc) (NMAuthChain *chain, GError *error, - DBusGMethodInvocation *context, + GDBusMethodInvocation *context, gpointer user_data); -NMAuthChain *nm_auth_chain_new_context (DBusGMethodInvocation *context, +NMAuthChain *nm_auth_chain_new_context (GDBusMethodInvocation *context, NMAuthChainResultFunc done_func, gpointer user_data); NMAuthChain *nm_auth_chain_new_subject (NMAuthSubject *subject, - DBusGMethodInvocation *context, + GDBusMethodInvocation *context, NMAuthChainResultFunc done_func, gpointer user_data); diff --git a/src/nm-dispatcher.c b/src/nm-dispatcher.c index 57fb0249c1..60560da705 100644 --- a/src/nm-dispatcher.c +++ b/src/nm-dispatcher.c @@ -34,7 +34,6 @@ #include "nm-dhcp6-config.h" #include "nm-ip4-config.h" #include "nm-ip6-config.h" -#include "nm-dbus-glib-types.h" #include "nm-settings-connection.h" #include "nm-platform.h" #include "nm-core-internal.h" diff --git a/src/rdisc/tests/Makefile.am b/src/rdisc/tests/Makefile.am index 12e047b39c..b5b09f1979 100644 --- a/src/rdisc/tests/Makefile.am +++ b/src/rdisc/tests/Makefile.am @@ -15,7 +15,6 @@ AM_CPPFLAGS = \ AM_CFLAGS = $(CODE_COVERAGE_CFLAGS) AM_LDFLAGS = \ $(GLIB_LIBS) \ - $(DBUS_LIBS) \ $(CODE_COVERAGE_LDFLAGS) @GNOME_CODE_COVERAGE_RULES@ diff --git a/src/settings/plugins/ibft/Makefile.am b/src/settings/plugins/ibft/Makefile.am index d34ee6eab9..3f9e934645 100644 --- a/src/settings/plugins/ibft/Makefile.am +++ b/src/settings/plugins/ibft/Makefile.am @@ -20,7 +20,6 @@ AM_CPPFLAGS = \ -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \ -DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \ $(GLIB_CFLAGS) \ - $(DBUS_CFLAGS) \ -DG_LOG_DOMAIN=\""NetworkManager-ibft"\" \ -DSYSCONFDIR=\"$(sysconfdir)\" \ -DSBINDIR=\"$(sbindir)\" diff --git a/src/settings/plugins/ibft/plugin.c b/src/settings/plugins/ibft/plugin.c index 944209285b..71ccd70554 100644 --- a/src/settings/plugins/ibft/plugin.c +++ b/src/settings/plugins/ibft/plugin.c @@ -29,7 +29,6 @@ #include <nm-setting-connection.h> #include "nm-default.h" -#include "nm-dbus-glib-types.h" #include "nm-system-config-interface.h" #include "NetworkManagerUtils.h" diff --git a/src/settings/plugins/ibft/tests/Makefile.am b/src/settings/plugins/ibft/tests/Makefile.am index 083c66568e..257a3a5a01 100644 --- a/src/settings/plugins/ibft/tests/Makefile.am +++ b/src/settings/plugins/ibft/tests/Makefile.am @@ -20,7 +20,6 @@ AM_CPPFLAGS = \ AM_LDFLAGS = \ $(GLIB_LIBS) \ - $(DBUS_LIBS) \ $(CODE_COVERAGE_LDFLAGS) noinst_PROGRAMS = test-ibft diff --git a/src/settings/plugins/ifnet/Makefile.am b/src/settings/plugins/ifnet/Makefile.am index f9a5a4d53c..0be0cc6cab 100644 --- a/src/settings/plugins/ifnet/Makefile.am +++ b/src/settings/plugins/ifnet/Makefile.am @@ -13,7 +13,6 @@ AM_CPPFLAGS = \ -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \ -DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \ $(GLIB_CFLAGS) \ - $(DBUS_CFLAGS) \ -DSYSCONFDIR=\"$(sysconfdir)\" -DSBINDIR=\"$(sbindir)\" diff --git a/src/settings/plugins/ifnet/tests/Makefile.am b/src/settings/plugins/ifnet/tests/Makefile.am index 359894e32e..8d97f56f28 100644 --- a/src/settings/plugins/ifnet/tests/Makefile.am +++ b/src/settings/plugins/ifnet/tests/Makefile.am @@ -15,7 +15,6 @@ AM_CPPFLAGS= \ -DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \ $(CHECK_CFLAGS) \ $(GLIB_CFLAGS) \ - $(DBUS_CFLAGS) \ $(CODE_COVERAGE_CFLAGS) \ -DTEST_IFNET_DIR=\"$(abs_srcdir)\" \ -DTEST_SCRATCH_DIR=\"$(abs_builddir)/\" \ diff --git a/src/settings/plugins/ifupdown/Makefile.am b/src/settings/plugins/ifupdown/Makefile.am index bec8de06c4..dfa64e051b 100644 --- a/src/settings/plugins/ifupdown/Makefile.am +++ b/src/settings/plugins/ifupdown/Makefile.am @@ -12,7 +12,6 @@ AM_CPPFLAGS = \ -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \ -DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \ $(GLIB_CFLAGS) \ - $(DBUS_CFLAGS) \ $(GUDEV_CFLAGS) \ -DSYSCONFDIR=\"$(sysconfdir)\" diff --git a/src/settings/plugins/keyfile/Makefile.am b/src/settings/plugins/keyfile/Makefile.am index dc14261c80..f146e7bdd3 100644 --- a/src/settings/plugins/keyfile/Makefile.am +++ b/src/settings/plugins/keyfile/Makefile.am @@ -12,7 +12,6 @@ AM_CPPFLAGS = \ -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \ -DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \ $(GLIB_CFLAGS) \ - $(DBUS_CFLAGS) \ -DNMCONFDIR=\"$(nmconfdir)\" noinst_LTLIBRARIES = \ diff --git a/src/settings/plugins/keyfile/nm-keyfile-connection.c b/src/settings/plugins/keyfile/nm-keyfile-connection.c index 06504a99b6..9504df72f4 100644 --- a/src/settings/plugins/keyfile/nm-keyfile-connection.c +++ b/src/settings/plugins/keyfile/nm-keyfile-connection.c @@ -29,7 +29,6 @@ #include "nm-default.h" #include "nm-system-config-interface.h" -#include "nm-dbus-glib-types.h" #include "nm-keyfile-connection.h" #include "reader.h" #include "writer.h" diff --git a/src/settings/plugins/keyfile/tests/Makefile.am b/src/settings/plugins/keyfile/tests/Makefile.am index 221c1de0fe..80f934e798 100644 --- a/src/settings/plugins/keyfile/tests/Makefile.am +++ b/src/settings/plugins/keyfile/tests/Makefile.am @@ -12,7 +12,6 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/src/settings \ -I$(srcdir)/../ \ $(GLIB_CFLAGS) \ - $(DBUS_CFLAGS) \ $(CODE_COVERAGE_CFLAGS) \ -DG_LOG_DOMAIN=\""NetworkManager-keyfile"\" \ -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \ @@ -31,7 +30,6 @@ test_keyfile_SOURCES = \ test_keyfile_LDADD = \ $(top_builddir)/src/libNetworkManager.la \ - $(DBUS_LIBS) \ $(CODE_COVERAGE_LDFLAGS) @VALGRIND_RULES@ diff --git a/src/supplicant-manager/nm-supplicant-config.c b/src/supplicant-manager/nm-supplicant-config.c index 722645dd9c..7dbd4b774d 100644 --- a/src/supplicant-manager/nm-supplicant-config.c +++ b/src/supplicant-manager/nm-supplicant-config.c @@ -23,7 +23,6 @@ #include <string.h> #include <stdlib.h> -#include <dbus/dbus-glib.h> #include "nm-default.h" #include "nm-supplicant-config.h" diff --git a/src/supplicant-manager/nm-supplicant-manager.c b/src/supplicant-manager/nm-supplicant-manager.c index e0b132e8bd..8afddeec7f 100644 --- a/src/supplicant-manager/nm-supplicant-manager.c +++ b/src/supplicant-manager/nm-supplicant-manager.c @@ -22,7 +22,6 @@ #include "config.h" #include <string.h> -#include <dbus/dbus.h> #include "nm-default.h" #include "nm-supplicant-manager.h" diff --git a/src/supplicant-manager/tests/Makefile.am b/src/supplicant-manager/tests/Makefile.am index 032d97071b..63193a1b35 100644 --- a/src/supplicant-manager/tests/Makefile.am +++ b/src/supplicant-manager/tests/Makefile.am @@ -7,8 +7,7 @@ AM_CPPFLAGS = \ -DG_LOG_DOMAIN=\""NetworkManager"\" \ -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \ -DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \ - $(GLIB_CFLAGS) \ - $(DBUS_CFLAGS) + $(GLIB_CFLAGS) noinst_PROGRAMS = test-supplicant-config diff --git a/src/supplicant-manager/tests/test-supplicant-config.c b/src/supplicant-manager/tests/test-supplicant-config.c index 9e163606ce..24bfbfdb1c 100644 --- a/src/supplicant-manager/tests/test-supplicant-config.c +++ b/src/supplicant-manager/tests/test-supplicant-config.c @@ -30,8 +30,6 @@ #include <sys/types.h> #include <sys/stat.h> -#include <dbus/dbus-glib.h> - #include "nm-core-internal.h" #include "nm-supplicant-config.h" diff --git a/src/tests/Makefile.am b/src/tests/Makefile.am index c008385f1c..8e06a54799 100644 --- a/src/tests/Makefile.am +++ b/src/tests/Makefile.am @@ -12,8 +12,7 @@ AM_CPPFLAGS = \ -DG_LOG_DOMAIN=\""NetworkManager"\" \ -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \ -DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \ - $(GLIB_CFLAGS) \ - $(DBUS_CFLAGS) + $(GLIB_CFLAGS) noinst_PROGRAMS = \ test-general \ diff --git a/src/tests/config/Makefile.am b/src/tests/config/Makefile.am index a8e2905c80..e0e3e13218 100644 --- a/src/tests/config/Makefile.am +++ b/src/tests/config/Makefile.am @@ -9,7 +9,6 @@ AM_CPPFLAGS = \ -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \ -DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \ $(GLIB_CFLAGS) \ - $(DBUS_CFLAGS) \ -DSRCDIR=\""$(srcdir)"\" \ -DBUILDDIR=\""$(builddir)"\" |