diff options
| author | Sebastien Bacher <seb128@ubuntu.com> | 2019-08-09 11:09:27 +0200 |
|---|---|---|
| committer | Sebastien Bacher <seb128@ubuntu.com> | 2019-08-09 11:18:39 +0200 |
| commit | 820498b2158e0b05421ce0922f203a0699927fa8 (patch) | |
| tree | 3bf6d1089b762535ec5e59738d47ae2d2f54750f /shared/nm-test-libnm-utils.h | |
| parent | 1bd9f376796563dfb5016bada66c78b203f41d33 (diff) | |
| parent | 488dda3930545969f5644b57cfca81e21df031c3 (diff) | |
Merge remote-tracking branch 'salsa/master'
Diffstat (limited to 'shared/nm-test-libnm-utils.h')
| -rw-r--r-- | shared/nm-test-libnm-utils.h | 28 |
1 files changed, 0 insertions, 28 deletions
diff --git a/shared/nm-test-libnm-utils.h b/shared/nm-test-libnm-utils.h index 2b4fa600..4c921f4c 100644 --- a/shared/nm-test-libnm-utils.h +++ b/shared/nm-test-libnm-utils.h @@ -1,4 +1,3 @@ -/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ /* * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -22,22 +21,11 @@ #include "nm-utils/nm-test-utils.h" -#if (NETWORKMANAGER_COMPILATION) & NM_NETWORKMANAGER_COMPILATION_WITH_LIBNM_GLIB -#include "nm-dbus-glib-types.h" -#endif - -/*****************************************************************************/ - typedef struct { GDBusConnection *bus; GDBusProxy *proxy; GPid pid; int keepalive_fd; -#if (NETWORKMANAGER_COMPILATION) & NM_NETWORKMANAGER_COMPILATION_WITH_LIBNM_GLIB - struct { - DBusGConnection *bus; - } libdbus; -#endif } NMTstcServiceInfo; NMTstcServiceInfo *nmtstc_service_init (void); @@ -62,18 +50,6 @@ static inline void _nmtstc_auto_service_cleanup (NMTstcServiceInfo **info) }); \ NM_PRAGMA_WARNING_REENABLE -/*****************************************************************************/ - -#if (NETWORKMANAGER_COMPILATION) & NM_NETWORKMANAGER_COMPILATION_WITH_LIBNM_GLIB - -#include "nm-client.h" -#include "nm-remote-settings.h" - -NMClient *nmtstc_nm_client_new (void); -NMRemoteSettings *nmtstc_nm_remote_settings_new (void); - -#else - NMDevice *nmtstc_service_add_device (NMTstcServiceInfo *info, NMClient *client, const char *method, @@ -85,10 +61,6 @@ NMDevice * nmtstc_service_add_wired_device (NMTstcServiceInfo *sinfo, const char *hwaddr, const char **subchannels); -#endif - -/*****************************************************************************/ - void nmtstc_service_add_connection (NMTstcServiceInfo *sinfo, NMConnection *connection, gboolean verify_connection, |