libnm: add libnm/libnm-core (part 2)
authorDan Winship <danw@gnome.org>
Fri, 4 Jul 2014 17:26:57 +0000 (13:26 -0400)
committerDan Winship <danw@gnome.org>
Fri, 1 Aug 2014 18:34:04 +0000 (14:34 -0400)
This fixes up the code from the previous "clean" import, and adds
build infrastructure.

[There are two slightly orthogonal sets of changes in this patch.
First, the files added in the previous commit were modified as followed:

  # Replace internal references to "libnm-util" and "libnm-glib" with "libnm"
  perl -pi -e 's/libnm-(util|glib)/libnm/;' libnm-core/*.[ch] libnm-core/tests/*.[ch] libnm/*.[ch] libnm/tests/*.[ch]

  # Fix includes of the enum-types files
  perl -pi -e 's/nm-utils-enum-types/nm-core-enum-types/;' libnm-core/*.[ch] libnm-core/tests/*.[ch] libnm/*.[ch] libnm/tests/*.[ch]
  perl -pi -e 's/nm-glib-enum-types/nm-enum-types/;' libnm/*.[ch] libnm/tests/*.[ch]

  # Fix some python example code
  perl -pi -e 's/import NMClient/import NM/;' -e 's/NMClient.Client\(\)/NM.Client()/;' libnm/nm-client.c

Then, the build infrastructure was added (without further modifying
any existing files in libnm-core or libnm.)

Note: to regenerate libnm.ver after rebase:
  (head -2 libnm-util/libnm-util.ver; (grep -h '\s'nm_ libnm-util/libnm-util.ver libnm-glib/libnm-glib.ver | env LANG=C sort); tail -3 libnm-util/libnm-util.ver) > libnm/libnm.ver
]

31 files changed:
.gitignore
Makefile.am
configure.ac
libnm-core/Makefile.am [new file with mode: 0644]
libnm-core/Makefile.libnm-core [new file with mode: 0644]
libnm-core/NetworkManager.h
libnm-core/NetworkManagerVPN.h
libnm-core/nm-setting.c
libnm-core/nm-utils-private.h
libnm-core/nm-utils.c
libnm-core/nm-utils.h
libnm-core/tests/Makefile.am [new file with mode: 0644]
libnm-core/tests/test-general.c
libnm-core/tests/test-secrets.c
libnm-core/tests/test-setting-8021x.c
libnm-core/tests/test-setting-dcb.c
libnm-core/tests/test-settings-defaults.c
libnm/Makefile.am [new file with mode: 0644]
libnm/libnm-vpn.pc.in [new file with mode: 0644]
libnm/libnm-vpn.ver [new file with mode: 0644]
libnm/libnm.pc.in [new file with mode: 0644]
libnm/libnm.ver [new file with mode: 0644]
libnm/nm-client.c
libnm/nm-object.c
libnm/nm-object.h
libnm/nm-secret-agent.c
libnm/nm-types.h
libnm/tests/Makefile.am [new file with mode: 0644]
libnm/tests/libnm-test-launch.sh [new file with mode: 0755]
libnm/tests/test-nm-client.c
po/POTFILES.in

index 109c30b..2e6cdae 100644 (file)
@@ -164,6 +164,16 @@ valgrind-*.log
 /src/supplicant-manager/tests/test-supplicant-config
 /src/dhcp-manager/nm-dhcp-helper
 /system-settings/src
+/libnm-core/nm-version.h
+/libnm-core/tests/test-crypto
+/libnm-core/tests/test-settings-defaults
+/libnm-core/tests/test-general
+/libnm-core/tests/test-need-secrets
+/libnm-core/tests/test-secrets
+/libnm-core/tests/test-setting-8021x
+/libnm-core/tests/test-setting-dcb
+/libnm/tests/test-nm-client
+/libnm/tests/test-remote-settings-client
 /libnm-util/nm-version.h
 /libnm-util/nm-setting-docs.xml
 /libnm-util/test-crypto
index 54992d4..b3d4158 100644 (file)
@@ -3,6 +3,8 @@ include $(GLIB_MAKEFILE)
 SUBDIRS = \
        . \
        include \
+       libnm-core \
+       libnm \
        libnm-util \
        libnm-glib \
        introspection \
index d13057d..9b0fc2d 100644 (file)
@@ -833,6 +833,13 @@ src/devices/team/Makefile
 src/devices/wifi/Makefile
 src/devices/wifi/tests/Makefile
 src/devices/wwan/Makefile
+libnm-core/nm-version.h
+libnm-core/Makefile
+libnm-core/tests/Makefile
+libnm/libnm.pc
+libnm/libnm-vpn.pc
+libnm/Makefile
+libnm/tests/Makefile
 libnm-util/libnm-util.pc
 libnm-util/nm-version.h
 libnm-util/Makefile
diff --git a/libnm-core/Makefile.am b/libnm-core/Makefile.am
new file mode 100644 (file)
index 0000000..b9b9783
--- /dev/null
@@ -0,0 +1,48 @@
+include $(GLIB_MAKEFILE)
+
+SUBDIRS = . tests
+
+AM_CPPFLAGS = \
+       -I${top_srcdir}/include \
+       -DG_LOG_DOMAIN=\""libnm"\" \
+       -DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \
+       $(GLIB_CFLAGS) \
+       $(DBUS_CFLAGS)
+
+noinst_LTLIBRARIES = libnm-core.la
+
+# header/source defines are in Makefile.libnm-core, so they can be shared
+# with libnm/Makefile.am
+include Makefile.libnm-core
+
+libnmincludedir = $(includedir)/libnm
+
+libnminclude_HEADERS = $(libnm_core_headers)
+libnm_core_la_SOURCES =                        \
+       $(libnm_core_sources)           \
+       $(libnm_core_private_headers)
+
+GLIB_GENERATED = nm-core-enum-types.h nm-core-enum-types.c
+nm_core_enum_types_sources = $(filter-out NetworkManager%,$(notdir $(libnminclude_HEADERS)))
+GLIB_MKENUMS_H_FLAGS = --identifier-prefix NM
+GLIB_MKENUMS_C_FLAGS = --identifier-prefix NM
+
+libnm_core_la_LIBADD =                 \
+       $(GLIB_LIBS)                    \
+       $(DBUS_LIBS)                    \
+       $(UUID_LIBS)
+
+if WITH_GNUTLS
+AM_CPPFLAGS += $(LIBGCRYPT_CFLAGS) $(GNUTLS_CFLAGS)
+libnm_core_la_SOURCES += crypto_gnutls.c
+libnm_core_la_LIBADD += $(LIBGCRYPT_LIBS) $(GNUTLS_LIBS)
+endif
+
+if WITH_NSS
+AM_CPPFLAGS += $(NSS_CFLAGS)
+libnm_core_la_SOURCES += crypto_nss.c
+libnm_core_la_LIBADD += $(NSS_LIBS)
+endif
+
+BUILT_SOURCES = $(GLIB_GENERATED)
+CLEANFILES = $(BUILT_SOURCES)
diff --git a/libnm-core/Makefile.libnm-core b/libnm-core/Makefile.libnm-core
new file mode 100644 (file)
index 0000000..52e62c1
--- /dev/null
@@ -0,0 +1,82 @@
+# In order for this to work correctly from both libnm-core/ and libnm/,
+# we have to specify full pathnames. (We can't just use $(addprefix) from
+# libnm/, because that's incompatible with the Makefile.introspection rules.)
+
+core = $(top_srcdir)/libnm-core
+
+libnm_core_headers =                           \
+       $(core)/NetworkManager.h                \
+       $(core)/NetworkManagerVPN.h             \
+       $(core)/nm-connection.h                 \
+       $(core)/nm-core-enum-types.h            \
+       $(core)/nm-setting-8021x.h              \
+       $(core)/nm-setting-adsl.h               \
+       $(core)/nm-setting-bluetooth.h          \
+       $(core)/nm-setting-bond.h               \
+       $(core)/nm-setting-bridge-port.h        \
+       $(core)/nm-setting-bridge.h             \
+       $(core)/nm-setting-cdma.h               \
+       $(core)/nm-setting-connection.h         \
+       $(core)/nm-setting-dcb.h                \
+       $(core)/nm-setting-generic.h            \
+       $(core)/nm-setting-gsm.h                \
+       $(core)/nm-setting-infiniband.h         \
+       $(core)/nm-setting-ip4-config.h         \
+       $(core)/nm-setting-ip6-config.h         \
+       $(core)/nm-setting-olpc-mesh.h          \
+       $(core)/nm-setting-ppp.h                \
+       $(core)/nm-setting-pppoe.h              \
+       $(core)/nm-setting-serial.h             \
+       $(core)/nm-setting-team-port.h          \
+       $(core)/nm-setting-team.h               \
+       $(core)/nm-setting-vlan.h               \
+       $(core)/nm-setting-vpn.h                \
+       $(core)/nm-setting-wimax.h              \
+       $(core)/nm-setting-wired.h              \
+       $(core)/nm-setting-wireless-security.h  \
+       $(core)/nm-setting-wireless.h           \
+       $(core)/nm-setting.h                    \
+       $(core)/nm-utils.h                      \
+       $(core)/nm-version.h
+
+libnm_core_private_headers =                   \
+       $(core)/crypto.h                        \
+       $(core)/nm-param-spec-specialized.h     \
+       $(core)/nm-setting-private.h            \
+       $(core)/nm-utils-private.h
+
+libnm_core_sources =                           \
+       $(core)/crypto.c                        \
+       $(core)/nm-connection.c                 \
+       $(core)/nm-core-enum-types.c            \
+       $(core)/nm-param-spec-specialized.c     \
+       $(core)/nm-setting-8021x.c              \
+       $(core)/nm-setting-adsl.c               \
+       $(core)/nm-setting-bluetooth.c          \
+       $(core)/nm-setting-bond.c               \
+       $(core)/nm-setting-bridge-port.c        \
+       $(core)/nm-setting-bridge.c             \
+       $(core)/nm-setting-cdma.c               \
+       $(core)/nm-setting-connection.c         \
+       $(core)/nm-setting-dcb.c                \
+       $(core)/nm-setting-generic.c            \
+       $(core)/nm-setting-gsm.c                \
+       $(core)/nm-setting-infiniband.c         \
+       $(core)/nm-setting-ip4-config.c         \
+       $(core)/nm-setting-ip6-config.c         \
+       $(core)/nm-setting-olpc-mesh.c          \
+       $(core)/nm-setting-ppp.c                \
+       $(core)/nm-setting-pppoe.c              \
+       $(core)/nm-setting-serial.c             \
+       $(core)/nm-setting-team-port.c          \
+       $(core)/nm-setting-team.c               \
+       $(core)/nm-setting-vlan.c               \
+       $(core)/nm-setting-vpn.c                \
+       $(core)/nm-setting-wimax.c              \
+       $(core)/nm-setting-wired.c              \
+       $(core)/nm-setting-wireless-security.c  \
+       $(core)/nm-setting-wireless.c           \
+       $(core)/nm-setting.c                    \
+       $(core)/nm-utils.c                      \
+       $(core)/nm-value-transforms.c
+
index 08b4e6c..2280f2d 100644 (file)
@@ -19,8 +19,8 @@
 
 /* Definitions related to NetworkManager's D-Bus interfaces.
  *
- * Note that although this header is installed as part of libnm-util, it is also
- * used by some external code that does not link to libnm-util.
+ * Note that although this header is installed as part of libnm, it is also
+ * used by some external code that does not link to libnm.
  */
 
 #ifndef NETWORK_MANAGER_H
index f316572..0827bbf 100644 (file)
@@ -19,8 +19,8 @@
 
 /* D-Bus-related definitions for NetworkManager VPN plugins.
  *
- * Note that although this header is installed as part of libnm-util, it is also
- * used by some external code that does not link to libnm-util.
+ * Note that although this header is installed as part of libnm, it is also
+ * used by some external code that does not link to libnm.
  */
 
 #ifndef NETWORK_MANAGER_VPN_H
index 94a0cac..9a50a2b 100644 (file)
@@ -129,7 +129,7 @@ _ensure_registered (void)
  * @error_quark: the setting's error quark
  *
  * INTERNAL ONLY: registers a setting's internal properties, like its priority
- * and its error quark type, with libnm-util.
+ * and its error quark type, with libnm.
  *
  * A setting's priority should roughly follow the OSI layer model, but it also
  * controls which settings get asked for secrets first.  Thus settings which
@@ -680,7 +680,7 @@ should_compare_prop (NMSetting *setting,
  * @a: a #NMSetting
  * @b: a second #NMSetting to compare with the first
  * @flags: compare flags, e.g. %NM_SETTING_COMPARE_FLAG_EXACT
- * @invert_results: this parameter is used internally by libnm-util and should
+ * @invert_results: this parameter is used internally by libnm and should
  * be set to %FALSE.  If %TRUE inverts the meaning of the #NMSettingDiffResult.
  * @results: (inout) (transfer full) (element-type utf8 guint32): if the
  * settings differ, on return a hash table mapping the differing keys to one or
index 6e6d7b7..2909118 100644 (file)
@@ -48,9 +48,9 @@ const NMUtilsPrivateData *nm_utils_get_private (void);
 
 /**
  * NM_UTILS_PRIVATE_CALL:
- * @call: a call to a private libnm-util function
+ * @call: a call to a private libnm function
  *
- * Used to call private libnm-util functions. Eg, if there was a
+ * Used to call private libnm functions. Eg, if there was a
  * private function called nm_foo_get_bar(), you could call it like:
  *
  *   bar = NM_UTILS_PRIVATE_CALL (nm_foo_get_bar (foo, x, y, z));
index 753edd8..81b8f6d 100644 (file)
@@ -208,10 +208,10 @@ static gboolean initialized = FALSE;
  * nm_utils_init:
  * @error: location to store error, or %NULL
  *
- * Initializes libnm-util; should be called when starting and program that
- * uses libnm-util.  Sets up an atexit() handler to ensure de-initialization
+ * Initializes libnm; should be called when starting and program that
+ * uses libnm.  Sets up an atexit() handler to ensure de-initialization
  * is performed, but calling nm_utils_deinit() to explicitly deinitialize
- * libnm-util can also be done.  This function can be called more than once.
+ * libnm can also be done.  This function can be called more than once.
  *
  * Returns: %TRUE if the initialization was successful, %FALSE on failure.
  **/
@@ -232,7 +232,7 @@ nm_utils_init (GError **error)
 /**
  * nm_utils_deinit:
  *
- * Frees all resources used internally by libnm-util.  This function is called
+ * Frees all resources used internally by libnm.  This function is called
  * from an atexit() handler, set up by nm_utils_init(), but is safe to be called
  * more than once.  Subsequent calls have no effect until nm_utils_init() is
  * called again.
index 896b3e9..21c3059 100644 (file)
@@ -24,7 +24,7 @@
 #include <glib.h>
 
 #include "nm-connection.h"
-#include "nm-utils-enum-types.h"
+#include "nm-core-enum-types.h"
 
 G_BEGIN_DECLS
 
diff --git a/libnm-core/tests/Makefile.am b/libnm-core/tests/Makefile.am
new file mode 100644 (file)
index 0000000..ab9cedd
--- /dev/null
@@ -0,0 +1,89 @@
+if ENABLE_TESTS
+
+certsdir = $(top_srcdir)/libnm-util/tests/certs
+
+AM_CPPFLAGS = \
+       -I${top_srcdir}/include \
+       -I$(top_srcdir)/libnm-core \
+       -I$(top_builddir)/libnm-core \
+       -DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \
+       $(GLIB_CFLAGS) \
+       $(DBUS_CFLAGS) \
+       -DTEST_CERT_DIR=\"$(certsdir)\"
+
+noinst_PROGRAMS =              \
+       test-crypto             \
+       test-general            \
+       test-secrets            \
+       test-setting-8021x      \
+       test-setting-dcb        \
+       test-settings-defaults
+
+LDADD = \
+       $(top_builddir)/libnm-core/libnm-core.la \
+       $(GLIB_LIBS) \
+       $(DBUS_LIBS)
+
+check-local: test-crypto test-setting-8021x
+# Private key and CA certificate in the same file (PEM)
+       $(abs_builddir)/test-setting-8021x $(certsdir)/test_key_and_cert.pem "test"
+
+# Private key by itself (PEM)
+       $(abs_builddir)/test-setting-8021x $(certsdir)/test-key-only.pem "test"
+
+# PKCS#8 private key by itself (PEM)
+       $(abs_builddir)/test-setting-8021x $(certsdir)/pkcs8-enc-key.pem "1234567890"
+
+# Private key and CA certificate in the same file (pkcs12)
+       $(abs_builddir)/test-setting-8021x $(certsdir)/test-cert.p12 "test"
+
+# Normal CA certificate
+       $(abs_builddir)/test-crypto --cert $(certsdir)/test_ca_cert.pem
+
+# Another CA certificate
+       $(abs_builddir)/test-crypto --cert $(certsdir)/test2_ca_cert.pem
+
+# Normal CA certificate (DER format)
+       $(abs_builddir)/test-crypto --cert $(certsdir)/test_ca_cert.der
+
+# CA certificate without an ending newline
+       $(abs_builddir)/test-crypto --cert $(certsdir)/ca-no-ending-newline.pem
+
+# Combined user cert and private key
+       $(abs_builddir)/test-crypto --cert $(certsdir)/test_key_and_cert.pem
+
+# Another combined user cert and private key
+       $(abs_builddir)/test-crypto --cert $(certsdir)/test2_key_and_cert.pem
+
+# Private key with 8 bytes of tail padding
+       $(abs_builddir)/test-crypto --key \
+               $(certsdir)/test_key_and_cert.pem \
+               "test" \
+               $(certsdir)/test-key-only-decrypted.der
+
+# Private key only (not combined with a cert)
+       $(abs_builddir)/test-crypto --key \
+               $(certsdir)/test-key-only.pem \
+               "test" \
+               $(certsdir)/test-key-only-decrypted.der
+
+# Private key with 6 bytes of tail padding
+       $(abs_builddir)/test-crypto --key $(certsdir)/test2_key_and_cert.pem "12345testing"
+
+# PKCS#12 file
+       $(abs_builddir)/test-crypto --p12 $(certsdir)/test-cert.p12 "test"
+
+# Another PKCS#12 file
+       $(abs_builddir)/test-crypto --p12 $(certsdir)/test2-cert.p12 "12345testing"
+
+# PKCS#8 encrypted private key
+       $(abs_builddir)/test-crypto --pkcs8 \
+               $(certsdir)/pkcs8-enc-key.pem \
+               "1234567890"
+
+# Private key with AES cipher
+       $(abs_builddir)/test-crypto --key $(certsdir)/test-aes-key.pem "test-aes-password"
+
+TESTS = test-settings-defaults test-secrets test-general test-setting-dcb
+
+endif
index 0b3283e..ba96545 100644 (file)
@@ -122,54 +122,54 @@ test_setting_vpn_items (void)
        nm_setting_vpn_remove_secret (s_vpn, "foobar4");
 
        /* Try to add some blank values and make sure they are rejected */
-       g_test_expect_message ("libnm-util", G_LOG_LEVEL_CRITICAL, "*key != NULL*");
+       g_test_expect_message ("libnm", G_LOG_LEVEL_CRITICAL, "*key != NULL*");
        nm_setting_vpn_add_data_item (s_vpn, NULL, NULL);
        g_test_assert_expected_messages ();
 
-       g_test_expect_message ("libnm-util", G_LOG_LEVEL_CRITICAL, "*strlen (key) > 0*");
+       g_test_expect_message ("libnm", G_LOG_LEVEL_CRITICAL, "*strlen (key) > 0*");
        nm_setting_vpn_add_data_item (s_vpn, "", "");
        g_test_assert_expected_messages ();
 
-       g_test_expect_message ("libnm-util", G_LOG_LEVEL_CRITICAL, "*item != NULL*");
+       g_test_expect_message ("libnm", G_LOG_LEVEL_CRITICAL, "*item != NULL*");
        nm_setting_vpn_add_data_item (s_vpn, "foobar1", NULL);
        g_test_assert_expected_messages ();
 
-       g_test_expect_message ("libnm-util", G_LOG_LEVEL_CRITICAL, "*strlen (item) > 0*");
+       g_test_expect_message ("libnm", G_LOG_LEVEL_CRITICAL, "*strlen (item) > 0*");
        nm_setting_vpn_add_data_item (s_vpn, "foobar1", "");
        g_test_assert_expected_messages ();
 
-       g_test_expect_message ("libnm-util", G_LOG_LEVEL_CRITICAL, "*key != NULL*");
+       g_test_expect_message ("libnm", G_LOG_LEVEL_CRITICAL, "*key != NULL*");
        nm_setting_vpn_add_data_item (s_vpn, NULL, "blahblah1");
        g_test_assert_expected_messages ();
 
-       g_test_expect_message ("libnm-util", G_LOG_LEVEL_CRITICAL, "*strlen (key) > 0*");
+       g_test_expect_message ("libnm", G_LOG_LEVEL_CRITICAL, "*strlen (key) > 0*");
        nm_setting_vpn_add_data_item (s_vpn, "", "blahblah1");
        g_test_assert_expected_messages ();
 
        nm_setting_vpn_foreach_data_item (s_vpn, vpn_check_empty_func, "vpn-data-empty");
 
        /* Try to add some blank secrets and make sure they are rejected */
-       g_test_expect_message ("libnm-util", G_LOG_LEVEL_CRITICAL, "*key != NULL*");
+       g_test_expect_message ("libnm", G_LOG_LEVEL_CRITICAL, "*key != NULL*");
        nm_setting_vpn_add_secret (s_vpn, NULL, NULL);
        g_test_assert_expected_messages ();
 
-       g_test_expect_message ("libnm-util", G_LOG_LEVEL_CRITICAL, "*strlen (key) > 0*");
+       g_test_expect_message ("libnm", G_LOG_LEVEL_CRITICAL, "*strlen (key) > 0*");
        nm_setting_vpn_add_secret (s_vpn, "", "");
        g_test_assert_expected_messages ();
 
-       g_test_expect_message ("libnm-util", G_LOG_LEVEL_CRITICAL, "*secret != NULL*");
+       g_test_expect_message ("libnm", G_LOG_LEVEL_CRITICAL, "*secret != NULL*");
        nm_setting_vpn_add_secret (s_vpn, "foobar1", NULL);
        g_test_assert_expected_messages ();
 
-       g_test_expect_message ("libnm-util", G_LOG_LEVEL_CRITICAL, "*strlen (secret) > 0*");
+       g_test_expect_message ("libnm", G_LOG_LEVEL_CRITICAL, "*strlen (secret) > 0*");
        nm_setting_vpn_add_secret (s_vpn, "foobar1", "");
        g_test_assert_expected_messages ();
 
-       g_test_expect_message ("libnm-util", G_LOG_LEVEL_CRITICAL, "*key != NULL*");
+       g_test_expect_message ("libnm", G_LOG_LEVEL_CRITICAL, "*key != NULL*");
        nm_setting_vpn_add_secret (s_vpn, NULL, "blahblah1");
        g_test_assert_expected_messages ();
 
-       g_test_expect_message ("libnm-util", G_LOG_LEVEL_CRITICAL, "*strlen (key) > 0*");
+       g_test_expect_message ("libnm", G_LOG_LEVEL_CRITICAL, "*strlen (key) > 0*");
        nm_setting_vpn_add_secret (s_vpn, "", "blahblah1");
        g_test_assert_expected_messages ();
 
@@ -1066,53 +1066,53 @@ test_setting_connection_permissions_helpers (void)
        s_con = NM_SETTING_CONNECTION (nm_setting_connection_new ());
 
        /* Ensure a bad [type] is rejected */
-       g_test_expect_message ("libnm-util", G_LOG_LEVEL_CRITICAL, "*strcmp (ptype, \"user\") == 0*");
+       g_test_expect_message ("libnm", G_LOG_LEVEL_CRITICAL, "*strcmp (ptype, \"user\") == 0*");
        success = nm_setting_connection_add_permission (s_con, "foobar", "blah", NULL);
        g_test_assert_expected_messages ();
        ASSERT (success == FALSE,
                "setting-connection-permissions-helpers", "unexpected success adding bad permission type #1");
 
        /* Ensure a bad [type] is rejected */
-       g_test_expect_message ("libnm-util", G_LOG_LEVEL_CRITICAL, "*ptype*");
+       g_test_expect_message ("libnm", G_LOG_LEVEL_CRITICAL, "*ptype*");
        success = nm_setting_connection_add_permission (s_con, NULL, "blah", NULL);
        g_test_assert_expected_messages ();
        ASSERT (success == FALSE,
                "setting-connection-permissions-helpers", "unexpected success adding bad permission type #2");
 
        /* Ensure a bad [item] is rejected */
-       g_test_expect_message ("libnm-util", G_LOG_LEVEL_CRITICAL, "*uname*");
-       g_test_expect_message ("libnm-util", G_LOG_LEVEL_CRITICAL, "*p != NULL*");
+       g_test_expect_message ("libnm", G_LOG_LEVEL_CRITICAL, "*uname*");
+       g_test_expect_message ("libnm", G_LOG_LEVEL_CRITICAL, "*p != NULL*");
        success = nm_setting_connection_add_permission (s_con, "user", NULL, NULL);
        g_test_assert_expected_messages ();
        ASSERT (success == FALSE,
                "setting-connection-permissions-helpers", "unexpected success adding bad permission item #1");
 
        /* Ensure a bad [item] is rejected */
-       g_test_expect_message ("libnm-util", G_LOG_LEVEL_CRITICAL, "*uname[0] != '\\0'*");
-       g_test_expect_message ("libnm-util", G_LOG_LEVEL_CRITICAL, "*p != NULL*");
+       g_test_expect_message ("libnm", G_LOG_LEVEL_CRITICAL, "*uname[0] != '\\0'*");
+       g_test_expect_message ("libnm", G_LOG_LEVEL_CRITICAL, "*p != NULL*");
        success = nm_setting_connection_add_permission (s_con, "user", "", NULL);
        g_test_assert_expected_messages ();
        ASSERT (success == FALSE,
                "setting-connection-permissions-helpers", "unexpected success adding bad permission item #2");
 
        /* Ensure an [item] with ':' is rejected */
-       g_test_expect_message ("libnm-util", G_LOG_LEVEL_CRITICAL, "*strchr (uname, ':')*");
-       g_test_expect_message ("libnm-util", G_LOG_LEVEL_CRITICAL, "*p != NULL*");
+       g_test_expect_message ("libnm", G_LOG_LEVEL_CRITICAL, "*strchr (uname, ':')*");
+       g_test_expect_message ("libnm", G_LOG_LEVEL_CRITICAL, "*p != NULL*");
        success = nm_setting_connection_add_permission (s_con, "user", "ad:asdf", NULL);
        g_test_assert_expected_messages ();
        ASSERT (success == FALSE,
                "setting-connection-permissions-helpers", "unexpected success adding bad permission item #3");
 
        /* Ensure a non-UTF-8 [item] is rejected */
-       g_test_expect_message ("libnm-util", G_LOG_LEVEL_CRITICAL, "*g_utf8_validate (uname, -1, NULL)*");
-       g_test_expect_message ("libnm-util", G_LOG_LEVEL_CRITICAL, "*p != NULL*");
+       g_test_expect_message ("libnm", G_LOG_LEVEL_CRITICAL, "*g_utf8_validate (uname, -1, NULL)*");
+       g_test_expect_message ("libnm", G_LOG_LEVEL_CRITICAL, "*p != NULL*");
        success = nm_setting_connection_add_permission (s_con, "user", buf, NULL);
        g_test_assert_expected_messages ();
        ASSERT (success == FALSE,
                "setting-connection-permissions-helpers", "unexpected success adding bad permission item #4");
 
        /* Ensure a non-NULL [detail] is rejected */
-       g_test_expect_message ("libnm-util", G_LOG_LEVEL_CRITICAL, "*detail == NULL*");
+       g_test_expect_message ("libnm", G_LOG_LEVEL_CRITICAL, "*detail == NULL*");
        success = nm_setting_connection_add_permission (s_con, "user", "dafasdf", "asdf");
        g_test_assert_expected_messages ();
        ASSERT (success == FALSE,
@@ -1190,56 +1190,56 @@ test_setting_connection_permissions_property (void)
        s_con = NM_SETTING_CONNECTION (nm_setting_connection_new ());
 
        /* Ensure a bad [type] is rejected */
-       g_test_expect_message ("libnm-util", G_LOG_LEVEL_CRITICAL, "*strncmp (str, PERM_USER_PREFIX, strlen (PERM_USER_PREFIX)) == 0*");
+       g_test_expect_message ("libnm", G_LOG_LEVEL_CRITICAL, "*strncmp (str, PERM_USER_PREFIX, strlen (PERM_USER_PREFIX)) == 0*");
        add_permission_property (s_con, "foobar", "blah", -1, NULL);
        g_test_assert_expected_messages ();
        ASSERT (nm_setting_connection_get_num_permissions (s_con) == 0,
                "setting-connection-permissions-property", "unexpected success adding bad permission type #1");
 
        /* Ensure a bad [type] is rejected */
-       g_test_expect_message ("libnm-util", G_LOG_LEVEL_CRITICAL, "*strncmp (str, PERM_USER_PREFIX, strlen (PERM_USER_PREFIX)) == 0*");
+       g_test_expect_message ("libnm", G_LOG_LEVEL_CRITICAL, "*strncmp (str, PERM_USER_PREFIX, strlen (PERM_USER_PREFIX)) == 0*");
        add_permission_property (s_con, NULL, "blah", -1, NULL);
        g_test_assert_expected_messages ();
        ASSERT (nm_setting_connection_get_num_permissions (s_con) == 0,
                "setting-connection-permissions-property", "unexpected success adding bad permission type #2");
 
        /* Ensure a bad [item] is rejected */
-       g_test_expect_message ("libnm-util", G_LOG_LEVEL_CRITICAL, "*last_colon > str*");
+       g_test_expect_message ("libnm", G_LOG_LEVEL_CRITICAL, "*last_colon > str*");
        add_permission_property (s_con, "user", NULL, -1, NULL);
        g_test_assert_expected_messages ();
        ASSERT (nm_setting_connection_get_num_permissions (s_con) == 0,
                "setting-connection-permissions-property", "unexpected success adding bad permission item #1");
 
        /* Ensure a bad [item] is rejected */
-       g_test_expect_message ("libnm-util", G_LOG_LEVEL_CRITICAL, "*last_colon > str*");
+       g_test_expect_message ("libnm", G_LOG_LEVEL_CRITICAL, "*last_colon > str*");
        add_permission_property (s_con, "user", "", -1, NULL);
        g_test_assert_expected_messages ();
        ASSERT (nm_setting_connection_get_num_permissions (s_con) == 0,
                "setting-connection-permissions-property", "unexpected success adding bad permission item #2");
 
        /* Ensure an [item] with ':' in the middle is rejected */
-       g_test_expect_message ("libnm-util", G_LOG_LEVEL_CRITICAL, "*str[i] != ':'*");
+       g_test_expect_message ("libnm", G_LOG_LEVEL_CRITICAL, "*str[i] != ':'*");
        add_permission_property (s_con, "user", "ad:asdf", -1, NULL);
        g_test_assert_expected_messages ();
        ASSERT (nm_setting_connection_get_num_permissions (s_con) == 0,
                "setting-connection-permissions-property", "unexpected success adding bad permission item #3");
 
        /* Ensure an [item] with ':' at the end is rejected */
-       g_test_expect_message ("libnm-util", G_LOG_LEVEL_CRITICAL, "*str[i] != ':'*");
+       g_test_expect_message ("libnm", G_LOG_LEVEL_CRITICAL, "*str[i] != ':'*");
        add_permission_property (s_con, "user", "adasdfaf:", -1, NULL);
        g_test_assert_expected_messages ();
        ASSERT (nm_setting_connection_get_num_permissions (s_con) == 0,
                "setting-connection-permissions-property", "unexpected success adding bad permission item #4");
 
        /* Ensure a non-UTF-8 [item] is rejected */
-       g_test_expect_message ("libnm-util", G_LOG_LEVEL_CRITICAL, "*g_utf8_validate (str, -1, NULL)*");
+       g_test_expect_message ("libnm", G_LOG_LEVEL_CRITICAL, "*g_utf8_validate (str, -1, NULL)*");
        add_permission_property (s_con, "user", buf, (int) sizeof (buf), NULL);
        g_test_assert_expected_messages ();
        ASSERT (nm_setting_connection_get_num_permissions (s_con) == 0,
                "setting-connection-permissions-property", "unexpected success adding bad permission item #5");
 
        /* Ensure a non-NULL [detail] is rejected */
-       g_test_expect_message ("libnm-util", G_LOG_LEVEL_CRITICAL, "*(last_colon + 1) == '\\0'*");
+       g_test_expect_message ("libnm", G_LOG_LEVEL_CRITICAL, "*(last_colon + 1) == '\\0'*");
        add_permission_property (s_con, "user", "dafasdf", -1, "asdf");
        g_test_assert_expected_messages ();
        ASSERT (nm_setting_connection_get_num_permissions (s_con) == 0,
@@ -2071,7 +2071,7 @@ test_setting_connection_changed_signal (void)
        ASSERT_CHANGED (nm_setting_connection_add_permission (s_con, "user", "billsmith", NULL));
        ASSERT_CHANGED (nm_setting_connection_remove_permission (s_con, 0));
 
-       g_test_expect_message ("libnm-util", G_LOG_LEVEL_CRITICAL, "*iter != NULL*");
+       g_test_expect_message ("libnm", G_LOG_LEVEL_CRITICAL, "*iter != NULL*");
        ASSERT_UNCHANGED (nm_setting_connection_remove_permission (s_con, 1));
        g_test_assert_expected_messages ();
 
@@ -2079,7 +2079,7 @@ test_setting_connection_changed_signal (void)
        ASSERT_CHANGED (nm_setting_connection_add_secondary (s_con, uuid));
        ASSERT_CHANGED (nm_setting_connection_remove_secondary (s_con, 0));
 
-       g_test_expect_message ("libnm-util", G_LOG_LEVEL_CRITICAL, "*elt != NULL*");
+       g_test_expect_message ("libnm", G_LOG_LEVEL_CRITICAL, "*elt != NULL*");
        ASSERT_UNCHANGED (nm_setting_connection_remove_secondary (s_con, 1));
        g_test_assert_expected_messages ();
 
@@ -2130,7 +2130,7 @@ test_setting_ip4_changed_signal (void)
        ASSERT_CHANGED (nm_setting_ip4_config_add_dns (s_ip4, 0x1122));
        ASSERT_CHANGED (nm_setting_ip4_config_remove_dns (s_ip4, 0));
 
-       g_test_expect_message ("libnm-util", G_LOG_LEVEL_CRITICAL, "*i <= priv->dns->len*");
+       g_test_expect_message ("libnm", G_LOG_LEVEL_CRITICAL, "*i <= priv->dns->len*");
        ASSERT_UNCHANGED (nm_setting_ip4_config_remove_dns (s_ip4, 1));
        g_test_assert_expected_messages ();
 
@@ -2140,7 +2140,7 @@ test_setting_ip4_changed_signal (void)
        ASSERT_CHANGED (nm_setting_ip4_config_add_dns_search (s_ip4, "foobar.com"));
        ASSERT_CHANGED (nm_setting_ip4_config_remove_dns_search (s_ip4, 0));
 
-       g_test_expect_message ("libnm-util", G_LOG_LEVEL_CRITICAL, "*elt != NULL*");
+       g_test_expect_message ("libnm", G_LOG_LEVEL_CRITICAL, "*elt != NULL*");
        ASSERT_UNCHANGED (nm_setting_ip4_config_remove_dns_search (s_ip4, 1));
        g_test_assert_expected_messages ();
 
@@ -2153,7 +2153,7 @@ test_setting_ip4_changed_signal (void)
        ASSERT_CHANGED (nm_setting_ip4_config_add_address (s_ip4, addr));
        ASSERT_CHANGED (nm_setting_ip4_config_remove_address (s_ip4, 0));
 
-       g_test_expect_message ("libnm-util", G_LOG_LEVEL_CRITICAL, "*addr != NULL && label != NULL*");
+       g_test_expect_message ("libnm", G_LOG_LEVEL_CRITICAL, "*addr != NULL && label != NULL*");
        ASSERT_UNCHANGED (nm_setting_ip4_config_remove_address (s_ip4, 1));
        g_test_assert_expected_messages ();
 
@@ -2167,7 +2167,7 @@ test_setting_ip4_changed_signal (void)
        ASSERT_CHANGED (nm_setting_ip4_config_add_route (s_ip4, route));
        ASSERT_CHANGED (nm_setting_ip4_config_remove_route (s_ip4, 0));
 
-       g_test_expect_message ("libnm-util", G_LOG_LEVEL_CRITICAL, "*elt != NULL*");
+       g_test_expect_message ("libnm", G_LOG_LEVEL_CRITICAL, "*elt != NULL*");
        ASSERT_UNCHANGED (nm_setting_ip4_config_remove_route (s_ip4, 1));
        g_test_assert_expected_messages ();
 
@@ -2201,7 +2201,7 @@ test_setting_ip6_changed_signal (void)
        ASSERT_CHANGED (nm_setting_ip6_config_add_dns (s_ip6, &t));
        ASSERT_CHANGED (nm_setting_ip6_config_remove_dns (s_ip6, 0));
 
-       g_test_expect_message ("libnm-util", G_LOG_LEVEL_CRITICAL, "*elt != NULL*");
+       g_test_expect_message ("libnm", G_LOG_LEVEL_CRITICAL, "*elt != NULL*");
        ASSERT_UNCHANGED (nm_setting_ip6_config_remove_dns (s_ip6, 1));
        g_test_assert_expected_messages ();
 
@@ -2211,7 +2211,7 @@ test_setting_ip6_changed_signal (void)
        ASSERT_CHANGED (nm_setting_ip6_config_add_dns_search (s_ip6, "foobar.com"));
        ASSERT_CHANGED (nm_setting_ip6_config_remove_dns_search (s_ip6, 0));
 
-       g_test_expect_message ("libnm-util", G_LOG_LEVEL_CRITICAL, "*elt != NULL*");
+       g_test_expect_message ("libnm", G_LOG_LEVEL_CRITICAL, "*elt != NULL*");
        ASSERT_UNCHANGED (nm_setting_ip6_config_remove_dns_search (s_ip6, 1));
        g_test_assert_expected_messages ();
 
@@ -2225,7 +2225,7 @@ test_setting_ip6_changed_signal (void)
        ASSERT_CHANGED (nm_setting_ip6_config_add_address (s_ip6, addr));
        ASSERT_CHANGED (nm_setting_ip6_config_remove_address (s_ip6, 0));
 
-       g_test_expect_message ("libnm-util", G_LOG_LEVEL_CRITICAL, "*elt != NULL*");
+       g_test_expect_message ("libnm", G_LOG_LEVEL_CRITICAL, "*elt != NULL*");
        ASSERT_UNCHANGED (nm_setting_ip6_config_remove_address (s_ip6, 1));
        g_test_assert_expected_messages ();
 
@@ -2239,7 +2239,7 @@ test_setting_ip6_changed_signal (void)
        ASSERT_CHANGED (nm_setting_ip6_config_add_route (s_ip6, route));
        ASSERT_CHANGED (nm_setting_ip6_config_remove_route (s_ip6, 0));
 
-       g_test_expect_message ("libnm-util", G_LOG_LEVEL_CRITICAL, "*elt != NULL*");
+       g_test_expect_message ("libnm", G_LOG_LEVEL_CRITICAL, "*elt != NULL*");
        ASSERT_UNCHANGED (nm_setting_ip6_config_remove_route (s_ip6, 1));
        g_test_assert_expected_messages ();
 
@@ -2269,7 +2269,7 @@ test_setting_vlan_changed_signal (void)
 
        ASSERT_CHANGED (nm_setting_vlan_add_priority (s_vlan, NM_VLAN_INGRESS_MAP, 1, 3));
        ASSERT_CHANGED (nm_setting_vlan_remove_priority (s_vlan, NM_VLAN_INGRESS_MAP, 0));
-       g_test_expect_message ("libnm-util", G_LOG_LEVEL_CRITICAL, "*idx < g_slist_length (list)*");
+       g_test_expect_message ("libnm", G_LOG_LEVEL_CRITICAL, "*idx < g_slist_length (list)*");
        ASSERT_UNCHANGED (nm_setting_vlan_remove_priority (s_vlan, NM_VLAN_INGRESS_MAP, 1));
        g_test_assert_expected_messages ();
        ASSERT_CHANGED (nm_setting_vlan_add_priority_str (s_vlan, NM_VLAN_INGRESS_MAP, "1:3"));
@@ -2277,7 +2277,7 @@ test_setting_vlan_changed_signal (void)
 
        ASSERT_CHANGED (nm_setting_vlan_add_priority (s_vlan, NM_VLAN_EGRESS_MAP, 1, 3));
        ASSERT_CHANGED (nm_setting_vlan_remove_priority (s_vlan, NM_VLAN_EGRESS_MAP, 0));
-       g_test_expect_message ("libnm-util", G_LOG_LEVEL_CRITICAL, "*idx < g_slist_length (list)*");
+       g_test_expect_message ("libnm", G_LOG_LEVEL_CRITICAL, "*idx < g_slist_length (list)*");
        ASSERT_UNCHANGED (nm_setting_vlan_remove_priority (s_vlan, NM_VLAN_EGRESS_MAP, 1));
        g_test_assert_expected_messages ();
        ASSERT_CHANGED (nm_setting_vlan_add_priority_str (s_vlan, NM_VLAN_EGRESS_MAP, "1:3"));
@@ -2376,7 +2376,7 @@ test_setting_wireless_security_changed_signal (void)
        /* Protos */
        ASSERT_CHANGED (nm_setting_wireless_security_add_proto (s_wsec, "wpa"));
        ASSERT_CHANGED (nm_setting_wireless_security_remove_proto (s_wsec, 0));
-       g_test_expect_message ("libnm-util", G_LOG_LEVEL_CRITICAL, "*elt != NULL*");
+       g_test_expect_message ("libnm", G_LOG_LEVEL_CRITICAL, "*elt != NULL*");
        ASSERT_UNCHANGED (nm_setting_wireless_security_remove_proto (s_wsec, 1));
        g_test_assert_expected_messages ();
 
@@ -2386,7 +2386,7 @@ test_setting_wireless_security_changed_signal (void)
        /* Pairwise ciphers */
        ASSERT_CHANGED (nm_setting_wireless_security_add_pairwise (s_wsec, "tkip"));
        ASSERT_CHANGED (nm_setting_wireless_security_remove_pairwise (s_wsec, 0));
-       g_test_expect_message ("libnm-util", G_LOG_LEVEL_CRITICAL, "*elt != NULL*");
+       g_test_expect_message ("libnm", G_LOG_LEVEL_CRITICAL, "*elt != NULL*");
        ASSERT_UNCHANGED (nm_setting_wireless_security_remove_pairwise (s_wsec, 1));
        g_test_assert_expected_messages ();
 
@@ -2396,7 +2396,7 @@ test_setting_wireless_security_changed_signal (void)
        /* Group ciphers */
        ASSERT_CHANGED (nm_setting_wireless_security_add_group (s_wsec, "ccmp"));
        ASSERT_CHANGED (nm_setting_wireless_security_remove_group (s_wsec, 0));
-       g_test_expect_message ("libnm-util", G_LOG_LEVEL_CRITICAL, "*elt != NULL*");
+       g_test_expect_message ("libnm", G_LOG_LEVEL_CRITICAL, "*elt != NULL*");
        ASSERT_UNCHANGED (nm_setting_wireless_security_remove_group (s_wsec, 1));
        g_test_assert_expected_messages ();
 
@@ -2431,7 +2431,7 @@ test_setting_802_1x_changed_signal (void)
        /* EAP methods */
        ASSERT_CHANGED (nm_setting_802_1x_add_eap_method (s_8021x, "tls"));
        ASSERT_CHANGED (nm_setting_802_1x_remove_eap_method (s_8021x, 0));
-       g_test_expect_message ("libnm-util", G_LOG_LEVEL_CRITICAL, "*elt != NULL*");
+       g_test_expect_message ("libnm", G_LOG_LEVEL_CRITICAL, "*elt != NULL*");
        ASSERT_UNCHANGED (nm_setting_802_1x_remove_eap_method (s_8021x, 1));
        g_test_assert_expected_messages ();
 
@@ -2441,7 +2441,7 @@ test_setting_802_1x_changed_signal (void)
        /* alternate subject matches */
        ASSERT_CHANGED (nm_setting_802_1x_add_altsubject_match (s_8021x, "EMAIL:server@example.com"));
        ASSERT_CHANGED (nm_setting_802_1x_remove_altsubject_match (s_8021x, 0));
-       g_test_expect_message ("libnm-util", G_LOG_LEVEL_CRITICAL, "*elt != NULL*");
+       g_test_expect_message ("libnm", G_LOG_LEVEL_CRITICAL, "*elt != NULL*");
        ASSERT_UNCHANGED (nm_setting_802_1x_remove_altsubject_match (s_8021x, 1));
        g_test_assert_expected_messages ();
 
@@ -2451,7 +2451,7 @@ test_setting_802_1x_changed_signal (void)
        /* phase2 alternate subject matches */
        ASSERT_CHANGED (nm_setting_802_1x_add_phase2_altsubject_match (s_8021x, "EMAIL:server@example.com"));
        ASSERT_CHANGED (nm_setting_802_1x_remove_phase2_altsubject_match (s_8021x, 0));
-       g_test_expect_message ("libnm-util", G_LOG_LEVEL_CRITICAL, "*elt != NULL*");
+       g_test_expect_message ("libnm", G_LOG_LEVEL_CRITICAL, "*elt != NULL*");
        ASSERT_UNCHANGED (nm_setting_802_1x_remove_phase2_altsubject_match (s_8021x, 1));
        g_test_assert_expected_messages ();
 
index b829d12..5fe1d8b 100644 (file)
@@ -651,7 +651,7 @@ test_update_secrets_whole_connection_bad_setting (void)
        g_hash_table_insert (wsec_hash, NM_SETTING_WIRELESS_SECURITY_WEP_KEY0, string_to_gvalue (wepkey));
 
        /* Steal the wsec setting hash so it's not deallocated, and stuff it back
-        * in with a different name so we ensure libnm-util is returning the right
+        * in with a different name so we ensure libnm is returning the right
         * error when it finds an entry in the connection hash that doesn't match
         * any setting in the connection.
         */
@@ -728,7 +728,7 @@ int main (int argc, char **argv)
 #endif
 
        if (!nm_utils_init (&error))
-               FAIL ("nm-utils-init", "failed to initialize libnm-util: %s", error->message);
+               FAIL ("nm-utils-init", "failed to initialize libnm: %s", error->message);
 
        /* The tests */
        test_need_tls_secrets_path ();
index c496e47..af0d5b8 100644 (file)
@@ -417,7 +417,7 @@ int main (int argc, char **argv)
 #endif
 
        if (!nm_utils_init (&error))
-               FAIL ("nm-utils-init", "failed to initialize libnm-util: %s", error->message);
+               FAIL ("nm-utils-init", "failed to initialize libnm: %s", error->message);
 
        /* Test phase1 and phase2 path scheme */
        test_private_key_import (argv[1], argv[2], NM_SETTING_802_1X_CK_SCHEME_PATH);
index 4b114ad..3c61018 100644 (file)
@@ -296,7 +296,7 @@ test_dcb_bandwidth_sums (void)
        g_clear_error (&error);
 }
 
-#define TPATH "/libnm-util/settings/dcb/"
+#define TPATH "/libnm/settings/dcb/"
 
 int main (int argc, char **argv)
 {
index 9104b4b..c13416c 100644 (file)
@@ -109,7 +109,7 @@ int main (int argc, char **argv)
 #endif
 
        if (!nm_utils_init (&error))
-               FAIL ("nm-utils-init", "failed to initialize libnm-util: %s", error->message);
+               FAIL ("nm-utils-init", "failed to initialize libnm: %s", error->message);
 
        /* The tests */
        test_defaults (NM_TYPE_SETTING_CONNECTION, NM_SETTING_CONNECTION_SETTING_NAME);
diff --git a/libnm/Makefile.am b/libnm/Makefile.am
new file mode 100644 (file)
index 0000000..b0ea01a
--- /dev/null
@@ -0,0 +1,205 @@
+include $(GLIB_MAKEFILE)
+
+SUBDIRS = . tests
+
+AM_CPPFLAGS = \
+       -I$(top_srcdir)/include \
+       -I$(top_srcdir)/libnm-core \
+       -I$(top_builddir)/libnm-core \
+       -I$(top_srcdir)/libnm \
+       -I$(top_builddir)/libnm \
+       -DG_LOG_DOMAIN=\""libnm"\" \
+       -DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE
+
+include $(top_srcdir)/libnm-core/Makefile.libnm-core
+
+# libnm
+
+lib_LTLIBRARIES = libnm.la
+
+libnm_la_CFLAGS = \
+       $(GLIB_CFLAGS) \
+       $(DBUS_CFLAGS) \
+       $(GUDEV_CFLAGS) \
+       -DNMRUNDIR=\"$(nmrundir)\"
+
+libnmincludedir = $(includedir)/libnm
+
+libnminclude_HEADERS =                 \
+       nm-access-point.h               \
+       nm-active-connection.h          \
+       nm-client.h                     \
+       nm-device-adsl.h                \
+       nm-device-bond.h                \
+       nm-device-bridge.h              \
+       nm-device-bt.h                  \
+       nm-device-ethernet.h            \
+       nm-device-generic.h             \
+       nm-device-infiniband.h          \
+       nm-device-modem.h               \
+       nm-device-olpc-mesh.h           \
+       nm-device-team.h                \
+       nm-device-vlan.h                \
+       nm-device-wifi.h                \
+       nm-device-wimax.h               \
+       nm-device.h                     \
+       nm-dhcp4-config.h               \
+       nm-dhcp6-config.h               \
+       nm-enum-types.h                 \
+       nm-ip4-config.h                 \
+       nm-ip6-config.h                 \
+       nm-object.h                     \
+       nm-remote-connection.h          \
+       nm-remote-settings.h            \
+       nm-secret-agent.h               \
+       nm-types.h                      \
+       nm-vpn-connection.h             \
+       nm-wimax-nsp.h
+
+libnm_la_private_headers =             \
+       nm-dbus-helpers-private.h       \
+       nm-device-private.h             \
+       nm-object-cache.h               \
+       nm-object-private.h             \
+       nm-remote-connection-private.h  \
+       nm-types-private.h
+
+libnm_la_csources =                    \
+       nm-access-point.c               \
+       nm-active-connection.c          \
+       nm-client.c                     \
+       nm-dbus-helpers.c               \
+       nm-device-adsl.c                \
+       nm-device-bond.c                \
+       nm-device-bridge.c              \
+       nm-device-bt.c                  \
+       nm-device-ethernet.c            \
+       nm-device-generic.c             \
+       nm-device-infiniband.c          \
+       nm-device-modem.c               \
+       nm-device-olpc-mesh.c           \
+       nm-device-team.c                \
+       nm-device-vlan.c                \
+       nm-device-wifi.c                \
+       nm-device-wimax.c               \
+       nm-device.c                     \
+       nm-dhcp4-config.c               \
+       nm-dhcp6-config.c               \
+       nm-enum-types.c                 \
+       nm-ip4-config.c                 \
+       nm-ip6-config.c                 \
+       nm-object-cache.c               \
+       nm-object.c                     \
+       nm-remote-connection.c          \
+       nm-remote-settings.c            \
+       nm-secret-agent.c               \
+       nm-types.c                      \
+       nm-vpn-connection.c             \
+       nm-wimax-nsp.c
+
+libnm_la_SOURCES =                     \
+       $(libnm_la_csources)            \
+       $(libnm_la_private_headers)
+
+nm-secret-agent-glue.h: $(top_srcdir)/introspection/nm-secret-agent.xml
+       $(AM_V_GEN) dbus-binding-tool --prefix=nm_secret_agent --mode=glib-server --output=$@ $<
+
+GLIB_GENERATED = nm-enum-types.h nm-enum-types.c
+nm_enum_types_sources = $(libnminclude_HEADERS)
+GLIB_MKENUMS_H_FLAGS = --identifier-prefix NM --fhead '\#include <nm-core-enum-types.h>\n'
+GLIB_MKENUMS_C_FLAGS = --identifier-prefix NM
+
+BUILT_SOURCES = \
+       nm-vpn-plugin-glue.h \
+       nm-secret-agent-glue.h
+
+libnm_la_LIBADD = \
+       $(top_builddir)/libnm-core/libnm-core.la \
+       $(GLIB_LIBS) \
+       $(DBUS_LIBS) \
+       $(UUID_LIBS) \
+       $(GUDEV_LIBS)
+
+SYMBOL_VIS_FILE=$(srcdir)/libnm.ver
+
+libnm_la_LDFLAGS = -Wl,--version-script=$(SYMBOL_VIS_FILE) \
+       -version-info "0:0:0"
+
+
+# libnm-vpn
+
+lib_LTLIBRARIES += libnm-vpn.la
+
+libnmvpndir = $(includedir)/libnm
+
+libnmvpn_HEADERS =                     \
+       nm-vpn-plugin.h                 \
+       nm-vpn-plugin-ui-interface.h    \
+       nm-vpn-plugin-utils.h           \
+       nm-vpn-enum-types.h
+
+libnm_vpn_la_SOURCES = \
+       nm-vpn-plugin.c \
+       nm-vpn-plugin-ui-interface.c \
+       nm-vpn-plugin-utils.c \
+       nm-vpn-enum-types.c
+
+nm-vpn-plugin-glue.h: $(top_srcdir)/introspection/nm-vpn-plugin.xml
+       $(AM_V_GEN) dbus-binding-tool --prefix=nm_vpn_plugin --mode=glib-server --output=$@ $<
+
+GLIB_GENERATED += nm-vpn-enum-types.h nm-vpn-enum-types.c
+nm_vpn_enum_types_sources = $(libnmvpn_HEADERS)
+libnm_vpn_la_CFLAGS = $(GLIB_CFLAGS) $(DBUS_CFLAGS)
+libnm_vpn_la_LIBADD = $(GLIB_LIBS) $(DBUS_LIBS)
+libnm_vpn_la_LDFLAGS = -Wl,--version-script=$(srcdir)/libnm-vpn.ver \
+       -version-info "0:0:0"
+
+###
+
+BUILT_SOURCES += $(GLIB_GENERATED)
+
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = libnm.pc libnm-vpn.pc
+
+DISTCLEANFILES = libnm.pc libnm-vpn.pc
+
+EXTRA_DIST = libnm.pc.in libnm-vpn.pc.in libnm.ver libnm-vpn.ver
+
+CLEANFILES = $(BUILT_SOURCES)
+
+-include $(INTROSPECTION_MAKEFILE)
+INTROSPECTION_GIRS =
+INTROSPECTION_COMPILER_ARGS =                  \
+       --includedir=$(top_srcdir)/libnm-core   \
+       --includedir=$(top_builddir)/libnm-core \
+       --includedir=$(top_srcdir)/libnm        \
+       --includedir=$(top_builddir)/libnm
+
+if HAVE_INTROSPECTION
+introspection_sources =                                \
+       $(libnm_core_headers)                   \
+       $(libnminclude_HEADERS)                 \
+       $(libnm_core_sources)                   \
+       $(libnm_la_csources)
+
+NM-1.0.gir: libnm.la
+NM_1_0_gir_INCLUDES = Gio-2.0 DBusGLib-1.0
+NM_1_0_gir_PACKAGES = gio-2.0 dbus-glib-1 gudev-1.0
+NM_1_0_gir_EXPORT_PACKAGES = libnm
+NM_1_0_gir_CFLAGS = $(AM_CPPFLAGS)
+NM_1_0_gir_LIBS = libnm.la
+NM_1_0_gir_FILES = $(introspection_sources)
+NM_1_0_gir_SCANNERFLAGS = --warn-all --identifier-prefix=NM --symbol-prefix=nm
+INTROSPECTION_GIRS += NM-1.0.gir
+
+girdir = $(datadir)/gir-1.0
+gir_DATA = $(INTROSPECTION_GIRS)
+
+typelibdir = $(libdir)/girepository-1.0
+typelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib)
+
+CLEANFILES += $(gir_DATA) $(typelib_DATA)
+endif
+
+check-local:
+       $(top_srcdir)/tools/check-exports.sh $(builddir)/.libs/libnm.so $(SYMBOL_VIS_FILE)
diff --git a/libnm/libnm-vpn.pc.in b/libnm/libnm-vpn.pc.in
new file mode 100644 (file)
index 0000000..ef847d5
--- /dev/null
@@ -0,0 +1,13 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: libnm-vpn
+Description: Convenience library for NetworkManager VPN plugins
+Version: @VERSION@
+Requires: libnm >= @VERSION@ gio-2.0 dbus-glib-1
+Cflags: -I${includedir}/libnm
+Libs: -L${libdir} -lnm-vpn
+
+
diff --git a/libnm/libnm-vpn.ver b/libnm/libnm-vpn.ver
new file mode 100644 (file)
index 0000000..b2e763b
--- /dev/null
@@ -0,0 +1,29 @@
+{
+global:
+       nm_vpn_plugin_disconnect;
+       nm_vpn_plugin_error_get_type;
+       nm_vpn_plugin_error_quark;
+       nm_vpn_plugin_failure;
+       nm_vpn_plugin_get_connection;
+       nm_vpn_plugin_get_state;
+       nm_vpn_plugin_get_type;
+       nm_vpn_plugin_secrets_required;
+       nm_vpn_plugin_set_ip4_config;
+       nm_vpn_plugin_set_login_banner;
+       nm_vpn_plugin_set_state;
+       nm_vpn_plugin_ui_interface_delete_connection;
+       nm_vpn_plugin_ui_interface_export;
+       nm_vpn_plugin_ui_interface_get_capabilities;
+       nm_vpn_plugin_ui_interface_get_suggested_name;
+       nm_vpn_plugin_ui_interface_get_type;
+       nm_vpn_plugin_ui_interface_import;
+       nm_vpn_plugin_ui_interface_ui_factory;
+       nm_vpn_plugin_ui_widget_interface_get_type;
+       nm_vpn_plugin_ui_widget_interface_get_widget;
+       nm_vpn_plugin_ui_widget_interface_save_secrets;
+       nm_vpn_plugin_ui_widget_interface_update_connection;
+       nm_vpn_plugin_utils_get_secret_flags;
+       nm_vpn_plugin_utils_read_vpn_details;
+local:
+       *;
+};
diff --git a/libnm/libnm.pc.in b/libnm/libnm.pc.in
new file mode 100644 (file)
index 0000000..6392799
--- /dev/null
@@ -0,0 +1,13 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: libnm
+Description: Convenience library for clients of NetworkManager
+Version: @VERSION@
+Requires: gio-2.0 dbus-glib-1
+Cflags: -I${includedir}/libnm
+Libs: -L${libdir} -lnm
+
+
diff --git a/libnm/libnm.ver b/libnm/libnm.ver
new file mode 100644 (file)
index 0000000..aed087d
--- /dev/null
@@ -0,0 +1,958 @@
+{
+global:
+       nm_access_point_connection_valid;
+       nm_access_point_filter_connections;
+       nm_access_point_get_bssid;
+       nm_access_point_get_flags;
+       nm_access_point_get_frequency;
+       nm_access_point_get_hw_address;
+       nm_access_point_get_max_bitrate;
+       nm_access_point_get_mode;
+       nm_access_point_get_rsn_flags;
+       nm_access_point_get_ssid;
+       nm_access_point_get_strength;
+       nm_access_point_get_type;
+       nm_access_point_get_wpa_flags;
+       nm_access_point_new;
+       nm_active_connection_get_connection;
+       nm_active_connection_get_connection_type;
+       nm_active_connection_get_default6;
+       nm_active_connection_get_default;
+       nm_active_connection_get_devices;
+       nm_active_connection_get_dhcp4_config;
+       nm_active_connection_get_dhcp6_config;
+       nm_active_connection_get_id;
+       nm_active_connection_get_ip4_config;
+       nm_active_connection_get_ip6_config;
+       nm_active_connection_get_master;
+       nm_active_connection_get_specific_object;
+       nm_active_connection_get_state;
+       nm_active_connection_get_type;
+       nm_active_connection_get_uuid;
+       nm_active_connection_get_vpn;
+       nm_active_connection_new;
+       nm_client_activate_connection;
+       nm_client_add_and_activate_connection;
+       nm_client_check_connectivity;
+       nm_client_check_connectivity_async;
+       nm_client_check_connectivity_finish;
+       nm_client_deactivate_connection;
+       nm_client_error_get_type;
+       nm_client_error_quark;
+       nm_client_get_activating_connection;
+       nm_client_get_active_connections;
+       nm_client_get_connectivity;
+       nm_client_get_device_by_iface;
+       nm_client_get_device_by_path;
+       nm_client_get_devices;
+       nm_client_get_logging;
+       nm_client_get_manager_running;
+       nm_client_get_permission_result;
+       nm_client_get_primary_connection;
+       nm_client_get_startup;
+       nm_client_get_state;
+       nm_client_get_type;
+       nm_client_get_version;
+       nm_client_networking_get_enabled;
+       nm_client_networking_set_enabled;
+       nm_client_new;
+       nm_client_new_async;
+       nm_client_new_finish;
+       nm_client_permission_get_type;
+       nm_client_permission_result_get_type;
+       nm_client_set_logging;
+       nm_client_sleep;
+       nm_client_wimax_get_enabled;
+       nm_client_wimax_hardware_get_enabled;
+       nm_client_wimax_set_enabled;
+       nm_client_wireless_get_enabled;
+       nm_client_wireless_hardware_get_enabled;
+       nm_client_wireless_set_enabled;
+       nm_client_wwan_get_enabled;
+       nm_client_wwan_hardware_get_enabled;
+       nm_client_wwan_set_enabled;
+       nm_connection_add_setting;
+       nm_connection_clear_secrets;
+       nm_connection_clear_secrets_with_flags;
+       nm_connection_compare;
+       nm_connection_create_setting;
+       nm_connection_diff;
+       nm_connection_dump;
+       nm_connection_duplicate;
+       nm_connection_error_get_type;
+       nm_connection_error_quark;
+       nm_connection_for_each_setting_value;
+       nm_connection_get_connection_type;
+       nm_connection_get_id;
+       nm_connection_get_interface_name;
+       nm_connection_get_path;
+       nm_connection_get_setting;
+       nm_connection_get_setting_802_1x;
+       nm_connection_get_setting_adsl;
+       nm_connection_get_setting_bluetooth;
+       nm_connection_get_setting_bond;
+       nm_connection_get_setting_bridge;
+       nm_connection_get_setting_bridge_port;
+       nm_connection_get_setting_by_name;
+       nm_connection_get_setting_cdma;
+       nm_connection_get_setting_connection;
+       nm_connection_get_setting_dcb;
+       nm_connection_get_setting_generic;
+       nm_connection_get_setting_gsm;
+       nm_connection_get_setting_infiniband;
+       nm_connection_get_setting_ip4_config;
+       nm_connection_get_setting_ip6_config;
+       nm_connection_get_setting_olpc_mesh;
+       nm_connection_get_setting_ppp;
+       nm_connection_get_setting_pppoe;
+       nm_connection_get_setting_serial;
+       nm_connection_get_setting_team;
+       nm_connection_get_setting_team_port;
+       nm_connection_get_setting_vlan;
+       nm_connection_get_setting_vpn;
+       nm_connection_get_setting_wimax;
+       nm_connection_get_setting_wired;
+       nm_connection_get_setting_wireless;
+       nm_connection_get_setting_wireless_security;
+       nm_connection_get_type;
+       nm_connection_get_uuid;
+       nm_connection_get_virtual_device_description;
+       nm_connection_get_virtual_iface_name;
+       nm_connection_is_type;
+       nm_connection_lookup_setting_type;
+       nm_connection_lookup_setting_type_by_quark;
+       nm_connection_need_secrets;
+       nm_connection_new;
+       nm_connection_new_from_hash;
+       nm_connection_normalize;
+       nm_connection_remove_setting;
+       nm_connection_replace_settings;
+       nm_connection_replace_settings_from_connection;
+       nm_connection_set_path;
+       nm_connection_to_hash;
+       nm_connection_update_secrets;
+       nm_connection_verify;
+       nm_device_adsl_error_get_type;
+       nm_device_adsl_error_quark;
+       nm_device_adsl_get_carrier;
+       nm_device_adsl_get_type;
+       nm_device_adsl_new;
+       nm_device_bond_error_get_type;
+       nm_device_bond_error_quark;
+       nm_device_bond_get_carrier;
+       nm_device_bond_get_hw_address;
+       nm_device_bond_get_slaves;
+       nm_device_bond_get_type;
+       nm_device_bond_new;
+       nm_device_bridge_error_get_type;
+       nm_device_bridge_error_quark;
+       nm_device_bridge_get_carrier;
+       nm_device_bridge_get_hw_address;
+       nm_device_bridge_get_slaves;
+       nm_device_bridge_get_type;
+       nm_device_bridge_new;
+       nm_device_bt_error_get_type;
+       nm_device_bt_error_quark;
+       nm_device_bt_get_capabilities;
+       nm_device_bt_get_hw_address;
+       nm_device_bt_get_name;
+       nm_device_bt_get_type;
+       nm_device_bt_new;
+       nm_device_connection_compatible;
+       nm_device_connection_valid;
+       nm_device_delete;
+       nm_device_disambiguate_names;
+       nm_device_disconnect;
+       nm_device_error_get_type;
+       nm_device_error_quark;
+       nm_device_ethernet_error_get_type;
+       nm_device_ethernet_error_quark;
+       nm_device_ethernet_get_carrier;
+       nm_device_ethernet_get_hw_address;
+       nm_device_ethernet_get_permanent_hw_address;
+       nm_device_ethernet_get_speed;
+       nm_device_ethernet_get_type;
+       nm_device_ethernet_new;
+       nm_device_filter_connections;
+       nm_device_generic_error_get_type;
+       nm_device_generic_error_quark;
+       nm_device_generic_get_hw_address;
+       nm_device_generic_get_type;
+       nm_device_generic_new;
+       nm_device_get_active_connection;
+       nm_device_get_autoconnect;
+       nm_device_get_available_connections;
+       nm_device_get_capabilities;
+       nm_device_get_description;
+       nm_device_get_device_type;
+       nm_device_get_dhcp4_config;
+       nm_device_get_dhcp6_config;
+       nm_device_get_driver;
+       nm_device_get_driver_version;
+       nm_device_get_firmware_missing;
+       nm_device_get_firmware_version;
+       nm_device_get_hw_address;
+       nm_device_get_iface;
+       nm_device_get_ip4_config;
+       nm_device_get_ip6_config;
+       nm_device_get_ip_iface;
+       nm_device_get_managed;
+       nm_device_get_mtu;
+       nm_device_get_physical_port_id;
+       nm_device_get_product;
+       nm_device_get_setting_type;
+       nm_device_get_state;
+       nm_device_get_state_reason;
+       nm_device_get_type;
+       nm_device_get_type_description;
+       nm_device_get_udi;
+       nm_device_get_vendor;
+       nm_device_infiniband_error_get_type;
+       nm_device_infiniband_error_quark;
+       nm_device_infiniband_get_carrier;
+       nm_device_infiniband_get_hw_address;
+       nm_device_infiniband_get_type;
+       nm_device_infiniband_new;
+       nm_device_is_software;
+       nm_device_modem_error_get_type;
+       nm_device_modem_error_quark;
+       nm_device_modem_get_current_capabilities;
+       nm_device_modem_get_modem_capabilities;
+       nm_device_modem_get_type;
+       nm_device_new;
+       nm_device_olpc_mesh_error_get_type;
+       nm_device_olpc_mesh_error_quark;
+       nm_device_olpc_mesh_get_active_channel;
+       nm_device_olpc_mesh_get_companion;
+       nm_device_olpc_mesh_get_hw_address;
+       nm_device_olpc_mesh_get_type;
+       nm_device_olpc_mesh_new;
+       nm_device_set_autoconnect;
+       nm_device_team_error_get_type;
+       nm_device_team_error_quark;
+       nm_device_team_get_carrier;
+       nm_device_team_get_hw_address;
+       nm_device_team_get_slaves;
+       nm_device_team_get_type;
+       nm_device_team_new;
+       nm_device_vlan_error_get_type;
+       nm_device_vlan_error_quark;
+       nm_device_vlan_get_carrier;
+       nm_device_vlan_get_hw_address;
+       nm_device_vlan_get_type;
+       nm_device_vlan_get_vlan_id;
+       nm_device_vlan_new;
+       nm_device_wifi_error_get_type;
+       nm_device_wifi_error_quark;
+       nm_device_wifi_get_access_point_by_path;
+       nm_device_wifi_get_access_points;
+       nm_device_wifi_get_active_access_point;
+       nm_device_wifi_get_bitrate;
+       nm_device_wifi_get_capabilities;
+       nm_device_wifi_get_hw_address;
+       nm_device_wifi_get_mode;
+       nm_device_wifi_get_permanent_hw_address;
+       nm_device_wifi_get_type;
+       nm_device_wifi_new;
+       nm_device_wifi_request_scan_simple;
+       nm_device_wimax_error_get_type;
+       nm_device_wimax_error_quark;
+       nm_device_wimax_get_active_nsp;
+       nm_device_wimax_get_bsid;
+       nm_device_wimax_get_center_frequency;
+       nm_device_wimax_get_cinr;
+       nm_device_wimax_get_hw_address;
+       nm_device_wimax_get_nsp_by_path;
+       nm_device_wimax_get_nsps;
+       nm_device_wimax_get_rssi;
+       nm_device_wimax_get_tx_power;
+       nm_device_wimax_get_type;
+       nm_device_wimax_new;
+       nm_dhcp4_config_get_one_option;
+       nm_dhcp4_config_get_options;
+       nm_dhcp4_config_get_type;
+       nm_dhcp4_config_new;
+       nm_dhcp6_config_get_one_option;
+       nm_dhcp6_config_get_options;
+       nm_dhcp6_config_get_type;
+       nm_dhcp6_config_new;
+       nm_ip4_address_compare;
+       nm_ip4_address_dup;
+       nm_ip4_address_get_address;
+       nm_ip4_address_get_gateway;
+       nm_ip4_address_get_prefix;
+       nm_ip4_address_get_type;
+       nm_ip4_address_new;
+       nm_ip4_address_ref;
+       nm_ip4_address_set_address;
+       nm_ip4_address_set_gateway;
+       nm_ip4_address_set_prefix;
+       nm_ip4_address_unref;
+       nm_ip4_config_get_addresses;
+       nm_ip4_config_get_domains;
+       nm_ip4_config_get_gateway;
+       nm_ip4_config_get_nameservers;
+       nm_ip4_config_get_routes;
+       nm_ip4_config_get_searches;
+       nm_ip4_config_get_type;
+       nm_ip4_config_get_wins_servers;
+       nm_ip4_config_new;
+       nm_ip4_route_compare;
+       nm_ip4_route_dup;
+       nm_ip4_route_get_dest;
+       nm_ip4_route_get_metric;
+       nm_ip4_route_get_next_hop;
+       nm_ip4_route_get_prefix;
+       nm_ip4_route_get_type;
+       nm_ip4_route_new;
+       nm_ip4_route_ref;
+       nm_ip4_route_set_dest;
+       nm_ip4_route_set_metric;
+       nm_ip4_route_set_next_hop;
+       nm_ip4_route_set_prefix;
+       nm_ip4_route_unref;
+       nm_ip6_address_array_get_type;
+       nm_ip6_address_compare;
+       nm_ip6_address_dup;
+       nm_ip6_address_get_address;
+       nm_ip6_address_get_gateway;
+       nm_ip6_address_get_prefix;
+       nm_ip6_address_get_type;
+       nm_ip6_address_new;
+       nm_ip6_address_object_array_get_type;
+       nm_ip6_address_ref;
+       nm_ip6_address_set_address;
+       nm_ip6_address_set_gateway;
+       nm_ip6_address_set_prefix;
+       nm_ip6_address_unref;
+       nm_ip6_config_get_addresses;
+       nm_ip6_config_get_domains;
+       nm_ip6_config_get_gateway;
+       nm_ip6_config_get_nameserver;
+       nm_ip6_config_get_nameservers;
+       nm_ip6_config_get_num_nameservers;
+       nm_ip6_config_get_routes;
+       nm_ip6_config_get_searches;
+       nm_ip6_config_get_type;
+       nm_ip6_config_new;
+       nm_ip6_route_compare;
+       nm_ip6_route_dup;
+       nm_ip6_route_get_dest;
+       nm_ip6_route_get_metric;
+       nm_ip6_route_get_next_hop;
+       nm_ip6_route_get_prefix;
+       nm_ip6_route_get_type;
+       nm_ip6_route_new;
+       nm_ip6_route_object_array_get_type;
+       nm_ip6_route_ref;
+       nm_ip6_route_set_dest;
+       nm_ip6_route_set_metric;
+       nm_ip6_route_set_next_hop;
+       nm_ip6_route_set_prefix;
+       nm_ip6_route_unref;
+       nm_object_array_get_type;
+       nm_object_error_get_type;
+       nm_object_error_quark;
+       nm_object_get_connection;
+       nm_object_get_path;
+       nm_object_get_type;
+       nm_remote_connection_commit_changes;
+       nm_remote_connection_commit_changes_unsaved;
+       nm_remote_connection_delete;
+       nm_remote_connection_error_get_type;
+       nm_remote_connection_error_quark;
+       nm_remote_connection_get_secrets;
+       nm_remote_connection_get_type;
+       nm_remote_connection_get_unsaved;
+       nm_remote_connection_new;
+       nm_remote_connection_save;
+       nm_remote_settings_add_connection;
+       nm_remote_settings_add_connection_unsaved;
+       nm_remote_settings_error_get_type;
+       nm_remote_settings_error_quark;
+       nm_remote_settings_get_connection_by_id;
+       nm_remote_settings_get_connection_by_path;
+       nm_remote_settings_get_connection_by_uuid;
+       nm_remote_settings_get_type;
+       nm_remote_settings_list_connections;
+       nm_remote_settings_load_connections;
+       nm_remote_settings_new;
+       nm_remote_settings_new_async;
+       nm_remote_settings_new_finish;
+       nm_remote_settings_reload_connections;
+       nm_remote_settings_save_hostname;
+       nm_secret_agent_capabilities_get_type;
+       nm_secret_agent_delete_secrets;
+       nm_secret_agent_error_get_type;
+       nm_secret_agent_error_quark;
+       nm_secret_agent_get_registered;
+       nm_secret_agent_get_secrets;
+       nm_secret_agent_get_secrets_flags_get_type;
+       nm_secret_agent_get_type;
+       nm_secret_agent_register;
+       nm_secret_agent_save_secrets;
+       nm_secret_agent_unregister;
+       nm_setting_802_1x_add_altsubject_match;
+       nm_setting_802_1x_add_eap_method;
+       nm_setting_802_1x_add_phase2_altsubject_match;
+       nm_setting_802_1x_ck_format_get_type;
+       nm_setting_802_1x_ck_scheme_get_type;
+       nm_setting_802_1x_clear_altsubject_matches;
+       nm_setting_802_1x_clear_eap_methods;
+       nm_setting_802_1x_clear_phase2_altsubject_matches;
+       nm_setting_802_1x_error_get_type;
+       nm_setting_802_1x_error_quark;
+       nm_setting_802_1x_get_altsubject_match;
+       nm_setting_802_1x_get_anonymous_identity;
+       nm_setting_802_1x_get_ca_cert_blob;
+       nm_setting_802_1x_get_ca_cert_path;
+       nm_setting_802_1x_get_ca_cert_scheme;
+       nm_setting_802_1x_get_ca_path;
+       nm_setting_802_1x_get_client_cert_blob;
+       nm_setting_802_1x_get_client_cert_path;
+       nm_setting_802_1x_get_client_cert_scheme;
+       nm_setting_802_1x_get_eap_method;
+       nm_setting_802_1x_get_identity;
+       nm_setting_802_1x_get_num_altsubject_matches;
+       nm_setting_802_1x_get_num_eap_methods;
+       nm_setting_802_1x_get_num_phase2_altsubject_matches;
+       nm_setting_802_1x_get_pac_file;
+       nm_setting_802_1x_get_password;
+       nm_setting_802_1x_get_password_flags;
+       nm_setting_802_1x_get_password_raw;
+       nm_setting_802_1x_get_password_raw_flags;
+       nm_setting_802_1x_get_phase1_fast_provisioning;
+       nm_setting_802_1x_get_phase1_peaplabel;
+       nm_setting_802_1x_get_phase1_peapver;
+       nm_setting_802_1x_get_phase2_altsubject_match;
+       nm_setting_802_1x_get_phase2_auth;
+       nm_setting_802_1x_get_phase2_autheap;
+       nm_setting_802_1x_get_phase2_ca_cert_blob;
+       nm_setting_802_1x_get_phase2_ca_cert_path;
+       nm_setting_802_1x_get_phase2_ca_cert_scheme;
+       nm_setting_802_1x_get_phase2_ca_path;
+       nm_setting_802_1x_get_phase2_client_cert_blob;
+       nm_setting_802_1x_get_phase2_client_cert_path;
+       nm_setting_802_1x_get_phase2_client_cert_scheme;
+       nm_setting_802_1x_get_phase2_private_key_blob;
+       nm_setting_802_1x_get_phase2_private_key_format;
+       nm_setting_802_1x_get_phase2_private_key_password;
+       nm_setting_802_1x_get_phase2_private_key_password_flags;
+       nm_setting_802_1x_get_phase2_private_key_path;
+       nm_setting_802_1x_get_phase2_private_key_scheme;
+       nm_setting_802_1x_get_phase2_subject_match;
+       nm_setting_802_1x_get_pin;
+       nm_setting_802_1x_get_pin_flags;
+       nm_setting_802_1x_get_private_key_blob;
+       nm_setting_802_1x_get_private_key_format;
+       nm_setting_802_1x_get_private_key_password;
+       nm_setting_802_1x_get_private_key_password_flags;
+       nm_setting_802_1x_get_private_key_path;
+       nm_setting_802_1x_get_private_key_scheme;
+       nm_setting_802_1x_get_subject_match;
+       nm_setting_802_1x_get_system_ca_certs;
+       nm_setting_802_1x_get_type;
+       nm_setting_802_1x_new;
+       nm_setting_802_1x_remove_altsubject_match;
+       nm_setting_802_1x_remove_altsubject_match_by_value;
+       nm_setting_802_1x_remove_eap_method;
+       nm_setting_802_1x_remove_eap_method_by_value;
+       nm_setting_802_1x_remove_phase2_altsubject_match;
+       nm_setting_802_1x_remove_phase2_altsubject_match_by_value;
+       nm_setting_802_1x_set_ca_cert;
+       nm_setting_802_1x_set_client_cert;
+       nm_setting_802_1x_set_phase2_ca_cert;
+       nm_setting_802_1x_set_phase2_client_cert;
+       nm_setting_802_1x_set_phase2_private_key;
+       nm_setting_802_1x_set_private_key;
+       nm_setting_adsl_error_get_type;
+       nm_setting_adsl_error_quark;
+       nm_setting_adsl_get_encapsulation;
+       nm_setting_adsl_get_password;
+       nm_setting_adsl_get_password_flags;
+       nm_setting_adsl_get_protocol;
+       nm_setting_adsl_get_type;
+       nm_setting_adsl_get_username;
+       nm_setting_adsl_get_vci;
+       nm_setting_adsl_get_vpi;
+       nm_setting_adsl_new;
+       nm_setting_bluetooth_error_get_type;
+       nm_setting_bluetooth_error_quark;
+       nm_setting_bluetooth_get_bdaddr;
+       nm_setting_bluetooth_get_connection_type;
+       nm_setting_bluetooth_get_type;
+       nm_setting_bluetooth_new;
+       nm_setting_bond_add_option;
+       nm_setting_bond_error_get_type;
+       nm_setting_bond_error_quark;
+       nm_setting_bond_get_interface_name;
+       nm_setting_bond_get_num_options;
+       nm_setting_bond_get_option;
+       nm_setting_bond_get_option_by_name;
+       nm_setting_bond_get_option_default;
+       nm_setting_bond_get_type;
+       nm_setting_bond_get_valid_options;
+       nm_setting_bond_new;
+       nm_setting_bond_remove_option;
+       nm_setting_bond_validate_option;
+       nm_setting_bridge_error_get_type;
+       nm_setting_bridge_error_quark;
+       nm_setting_bridge_get_ageing_time;
+       nm_setting_bridge_get_forward_delay;
+       nm_setting_bridge_get_hello_time;
+       nm_setting_bridge_get_interface_name;
+       nm_setting_bridge_get_mac_address;
+       nm_setting_bridge_get_max_age;
+       nm_setting_bridge_get_priority;
+       nm_setting_bridge_get_stp;
+       nm_setting_bridge_get_type;
+       nm_setting_bridge_new;
+       nm_setting_bridge_port_error_get_type;
+       nm_setting_bridge_port_error_quark;
+       nm_setting_bridge_port_get_hairpin_mode;
+       nm_setting_bridge_port_get_path_cost;
+       nm_setting_bridge_port_get_priority;
+       nm_setting_bridge_port_get_type;
+       nm_setting_bridge_port_new;
+       nm_setting_cdma_error_get_type;
+       nm_setting_cdma_error_quark;
+       nm_setting_cdma_get_number;
+       nm_setting_cdma_get_password;
+       nm_setting_cdma_get_password_flags;
+       nm_setting_cdma_get_type;
+       nm_setting_cdma_get_username;
+       nm_setting_cdma_new;
+       nm_setting_clear_secrets;
+       nm_setting_clear_secrets_with_flags;
+       nm_setting_compare;
+       nm_setting_compare_flags_get_type;
+       nm_setting_connection_add_permission;
+       nm_setting_connection_add_secondary;
+       nm_setting_connection_error_get_type;
+       nm_setting_connection_error_quark;
+       nm_setting_connection_get_autoconnect;
+       nm_setting_connection_get_connection_type;
+       nm_setting_connection_get_gateway_ping_timeout;
+       nm_setting_connection_get_id;
+       nm_setting_connection_get_interface_name;
+       nm_setting_connection_get_master;
+       nm_setting_connection_get_num_permissions;
+       nm_setting_connection_get_num_secondaries;
+       nm_setting_connection_get_permission;
+       nm_setting_connection_get_read_only;
+       nm_setting_connection_get_secondary;
+       nm_setting_connection_get_slave_type;
+       nm_setting_connection_get_timestamp;
+       nm_setting_connection_get_type;
+       nm_setting_connection_get_uuid;
+       nm_setting_connection_get_zone;
+       nm_setting_connection_is_slave_type;
+       nm_setting_connection_new;
+       nm_setting_connection_permissions_user_allowed;
+       nm_setting_connection_remove_permission;
+       nm_setting_connection_remove_permission_by_value;
+       nm_setting_connection_remove_secondary;
+       nm_setting_connection_remove_secondary_by_value;
+       nm_setting_dcb_error_get_type;
+       nm_setting_dcb_error_quark;
+       nm_setting_dcb_flags_get_type;
+       nm_setting_dcb_get_app_fcoe_flags;
+       nm_setting_dcb_get_app_fcoe_mode;
+       nm_setting_dcb_get_app_fcoe_priority;
+       nm_setting_dcb_get_app_fip_flags;
+       nm_setting_dcb_get_app_fip_priority;
+       nm_setting_dcb_get_app_iscsi_flags;
+       nm_setting_dcb_get_app_iscsi_priority;
+       nm_setting_dcb_get_priority_bandwidth;
+       nm_setting_dcb_get_priority_flow_control;
+       nm_setting_dcb_get_priority_flow_control_flags;
+       nm_setting_dcb_get_priority_group_bandwidth;
+       nm_setting_dcb_get_priority_group_flags;
+       nm_setting_dcb_get_priority_group_id;
+       nm_setting_dcb_get_priority_strict_bandwidth;
+       nm_setting_dcb_get_priority_traffic_class;
+       nm_setting_dcb_get_type;
+       nm_setting_dcb_new;
+       nm_setting_dcb_set_priority_bandwidth;
+       nm_setting_dcb_set_priority_flow_control;
+       nm_setting_dcb_set_priority_group_bandwidth;
+       nm_setting_dcb_set_priority_group_id;
+       nm_setting_dcb_set_priority_strict_bandwidth;
+       nm_setting_dcb_set_priority_traffic_class;
+       nm_setting_diff;
+       nm_setting_diff_result_get_type;
+       nm_setting_duplicate;
+       nm_setting_enumerate_values;
+       nm_setting_error_get_type;
+       nm_setting_error_quark;
+       nm_setting_generic_error_get_type;
+       nm_setting_generic_error_quark;
+       nm_setting_generic_get_type;
+       nm_setting_generic_new;
+       nm_setting_get_name;
+       nm_setting_get_secret_flags;
+       nm_setting_get_type;
+       nm_setting_get_virtual_iface_name;
+       nm_setting_gsm_error_get_type;
+       nm_setting_gsm_error_quark;
+       nm_setting_gsm_get_allowed_bands;
+       nm_setting_gsm_get_apn;
+       nm_setting_gsm_get_home_only;
+       nm_setting_gsm_get_network_id;
+       nm_setting_gsm_get_network_type;
+       nm_setting_gsm_get_number;
+       nm_setting_gsm_get_password;
+       nm_setting_gsm_get_password_flags;
+       nm_setting_gsm_get_pin;
+       nm_setting_gsm_get_pin_flags;
+       nm_setting_gsm_get_type;
+       nm_setting_gsm_get_username;
+       nm_setting_gsm_network_band_get_type;
+       nm_setting_gsm_network_type_get_type;
+       nm_setting_gsm_new;
+       nm_setting_hash_flags_get_type;
+       nm_setting_infiniband_error_get_type;
+       nm_setting_infiniband_error_quark;
+       nm_setting_infiniband_get_mac_address;
+       nm_setting_infiniband_get_mtu;
+       nm_setting_infiniband_get_p_key;
+       nm_setting_infiniband_get_parent;
+       nm_setting_infiniband_get_transport_mode;
+       nm_setting_infiniband_get_type;
+       nm_setting_infiniband_new;
+       nm_setting_ip4_config_add_address;
+       nm_setting_ip4_config_add_dns;
+       nm_setting_ip4_config_add_dns_search;
+       nm_setting_ip4_config_add_route;
+       nm_setting_ip4_config_clear_addresses;
+       nm_setting_ip4_config_clear_dns;
+       nm_setting_ip4_config_clear_dns_searches;
+       nm_setting_ip4_config_clear_routes;
+       nm_setting_ip4_config_error_get_type;
+       nm_setting_ip4_config_error_quark;
+       nm_setting_ip4_config_get_address;
+       nm_setting_ip4_config_get_dhcp_client_id;
+       nm_setting_ip4_config_get_dhcp_hostname;
+       nm_setting_ip4_config_get_dhcp_send_hostname;
+       nm_setting_ip4_config_get_dns;
+       nm_setting_ip4_config_get_dns_search;
+       nm_setting_ip4_config_get_ignore_auto_dns;
+       nm_setting_ip4_config_get_ignore_auto_routes;
+       nm_setting_ip4_config_get_may_fail;
+       nm_setting_ip4_config_get_method;
+       nm_setting_ip4_config_get_never_default;
+       nm_setting_ip4_config_get_num_addresses;
+       nm_setting_ip4_config_get_num_dns;
+       nm_setting_ip4_config_get_num_dns_searches;
+       nm_setting_ip4_config_get_num_routes;
+       nm_setting_ip4_config_get_route;
+       nm_setting_ip4_config_get_type;
+       nm_setting_ip4_config_new;
+       nm_setting_ip4_config_remove_address;
+       nm_setting_ip4_config_remove_address_by_value;
+       nm_setting_ip4_config_remove_dns;
+       nm_setting_ip4_config_remove_dns_by_value;
+       nm_setting_ip4_config_remove_dns_search;
+       nm_setting_ip4_config_remove_dns_search_by_value;
+       nm_setting_ip4_config_remove_route;
+       nm_setting_ip4_config_remove_route_by_value;
+       nm_setting_ip6_config_add_address;
+       nm_setting_ip6_config_add_dns;
+       nm_setting_ip6_config_add_dns_search;
+       nm_setting_ip6_config_add_route;
+       nm_setting_ip6_config_clear_addresses;
+       nm_setting_ip6_config_clear_dns;
+       nm_setting_ip6_config_clear_dns_searches;
+       nm_setting_ip6_config_clear_routes;
+       nm_setting_ip6_config_error_get_type;
+       nm_setting_ip6_config_error_quark;
+       nm_setting_ip6_config_get_address;
+       nm_setting_ip6_config_get_dhcp_hostname;
+       nm_setting_ip6_config_get_dns;
+       nm_setting_ip6_config_get_dns_search;
+       nm_setting_ip6_config_get_ignore_auto_dns;
+       nm_setting_ip6_config_get_ignore_auto_routes;
+       nm_setting_ip6_config_get_ip6_privacy;
+       nm_setting_ip6_config_get_may_fail;
+       nm_setting_ip6_config_get_method;
+       nm_setting_ip6_config_get_never_default;
+       nm_setting_ip6_config_get_num_addresses;
+       nm_setting_ip6_config_get_num_dns;
+       nm_setting_ip6_config_get_num_dns_searches;
+       nm_setting_ip6_config_get_num_routes;
+       nm_setting_ip6_config_get_route;
+       nm_setting_ip6_config_get_type;
+       nm_setting_ip6_config_new;
+       nm_setting_ip6_config_privacy_get_type;
+       nm_setting_ip6_config_remove_address;
+       nm_setting_ip6_config_remove_address_by_value;
+       nm_setting_ip6_config_remove_dns;
+       nm_setting_ip6_config_remove_dns_by_value;
+       nm_setting_ip6_config_remove_dns_search;
+       nm_setting_ip6_config_remove_dns_search_by_value;
+       nm_setting_ip6_config_remove_route;
+       nm_setting_ip6_config_remove_route_by_value;
+       nm_setting_need_secrets;
+       nm_setting_new_from_hash;
+       nm_setting_olpc_mesh_error_get_type;
+       nm_setting_olpc_mesh_error_quark;
+       nm_setting_olpc_mesh_get_channel;
+       nm_setting_olpc_mesh_get_dhcp_anycast_address;
+       nm_setting_olpc_mesh_get_ssid;
+       nm_setting_olpc_mesh_get_type;
+       nm_setting_olpc_mesh_new;
+       nm_setting_ppp_error_get_type;
+       nm_setting_ppp_error_quark;
+       nm_setting_ppp_get_baud;
+       nm_setting_ppp_get_crtscts;
+       nm_setting_ppp_get_lcp_echo_failure;
+       nm_setting_ppp_get_lcp_echo_interval;
+       nm_setting_ppp_get_mppe_stateful;
+       nm_setting_ppp_get_mru;
+       nm_setting_ppp_get_mtu;
+       nm_setting_ppp_get_no_vj_comp;
+       nm_setting_ppp_get_noauth;
+       nm_setting_ppp_get_nobsdcomp;
+       nm_setting_ppp_get_nodeflate;
+       nm_setting_ppp_get_refuse_chap;
+       nm_setting_ppp_get_refuse_eap;
+       nm_setting_ppp_get_refuse_mschap;
+       nm_setting_ppp_get_refuse_mschapv2;
+       nm_setting_ppp_get_refuse_pap;
+       nm_setting_ppp_get_require_mppe;
+       nm_setting_ppp_get_require_mppe_128;
+       nm_setting_ppp_get_type;
+       nm_setting_ppp_new;
+       nm_setting_pppoe_error_get_type;
+       nm_setting_pppoe_error_quark;
+       nm_setting_pppoe_get_password;
+       nm_setting_pppoe_get_password_flags;
+       nm_setting_pppoe_get_service;
+       nm_setting_pppoe_get_type;
+       nm_setting_pppoe_get_username;
+       nm_setting_pppoe_new;
+       nm_setting_secret_flags_get_type;
+       nm_setting_serial_error_get_type;
+       nm_setting_serial_error_quark;
+       nm_setting_serial_get_baud;
+       nm_setting_serial_get_bits;
+       nm_setting_serial_get_parity;
+       nm_setting_serial_get_send_delay;
+       nm_setting_serial_get_stopbits;
+       nm_setting_serial_get_type;
+       nm_setting_serial_new;
+       nm_setting_set_secret_flags;
+       nm_setting_team_error_get_type;
+       nm_setting_team_error_quark;
+       nm_setting_team_get_config;
+       nm_setting_team_get_interface_name;
+       nm_setting_team_get_type;
+       nm_setting_team_new;
+       nm_setting_team_port_error_get_type;
+       nm_setting_team_port_error_quark;
+       nm_setting_team_port_get_config;
+       nm_setting_team_port_get_type;
+       nm_setting_team_port_new;
+       nm_setting_to_hash;
+       nm_setting_to_string;
+       nm_setting_update_secrets;
+       nm_setting_verify;
+       nm_setting_vlan_add_priority;
+       nm_setting_vlan_add_priority_str;
+       nm_setting_vlan_clear_priorities;
+       nm_setting_vlan_error_get_type;
+       nm_setting_vlan_error_quark;
+       nm_setting_vlan_get_flags;
+       nm_setting_vlan_get_id;
+       nm_setting_vlan_get_interface_name;
+       nm_setting_vlan_get_num_priorities;
+       nm_setting_vlan_get_parent;
+       nm_setting_vlan_get_priority;
+       nm_setting_vlan_get_type;
+       nm_setting_vlan_new;
+       nm_setting_vlan_remove_priority;
+       nm_setting_vlan_remove_priority_by_value;
+       nm_setting_vlan_remove_priority_str_by_value;
+       nm_setting_vpn_add_data_item;
+       nm_setting_vpn_add_secret;
+       nm_setting_vpn_error_get_type;
+       nm_setting_vpn_error_quark;
+       nm_setting_vpn_foreach_data_item;
+       nm_setting_vpn_foreach_secret;
+       nm_setting_vpn_get_data_item;
+       nm_setting_vpn_get_num_data_items;
+       nm_setting_vpn_get_num_secrets;
+       nm_setting_vpn_get_secret;
+       nm_setting_vpn_get_service_type;
+       nm_setting_vpn_get_type;
+       nm_setting_vpn_get_user_name;
+       nm_setting_vpn_new;
+       nm_setting_vpn_remove_data_item;
+       nm_setting_vpn_remove_secret;
+       nm_setting_wimax_error_get_type;
+       nm_setting_wimax_error_quark;
+       nm_setting_wimax_get_mac_address;
+       nm_setting_wimax_get_network_name;
+       nm_setting_wimax_get_type;
+       nm_setting_wimax_new;
+       nm_setting_wired_add_mac_blacklist_item;
+       nm_setting_wired_add_s390_option;
+       nm_setting_wired_clear_mac_blacklist_items;
+       nm_setting_wired_error_get_type;
+       nm_setting_wired_error_quark;
+       nm_setting_wired_get_auto_negotiate;
+       nm_setting_wired_get_cloned_mac_address;
+       nm_setting_wired_get_duplex;
+       nm_setting_wired_get_mac_address;
+       nm_setting_wired_get_mac_address_blacklist;
+       nm_setting_wired_get_mac_blacklist_item;
+       nm_setting_wired_get_mtu;
+       nm_setting_wired_get_num_mac_blacklist_items;
+       nm_setting_wired_get_num_s390_options;
+       nm_setting_wired_get_port;
+       nm_setting_wired_get_s390_nettype;
+       nm_setting_wired_get_s390_option;
+       nm_setting_wired_get_s390_option_by_key;
+       nm_setting_wired_get_s390_subchannels;
+       nm_setting_wired_get_speed;
+       nm_setting_wired_get_type;
+       nm_setting_wired_get_valid_s390_options;
+       nm_setting_wired_new;
+       nm_setting_wired_remove_mac_blacklist_item;
+       nm_setting_wired_remove_mac_blacklist_item_by_value;
+       nm_setting_wired_remove_s390_option;
+       nm_setting_wireless_add_mac_blacklist_item;
+       nm_setting_wireless_add_seen_bssid;
+       nm_setting_wireless_ap_security_compatible;
+       nm_setting_wireless_clear_mac_blacklist_items;
+       nm_setting_wireless_error_get_type;
+       nm_setting_wireless_error_quark;
+       nm_setting_wireless_get_band;
+       nm_setting_wireless_get_bssid;
+       nm_setting_wireless_get_channel;
+       nm_setting_wireless_get_cloned_mac_address;
+       nm_setting_wireless_get_hidden;
+       nm_setting_wireless_get_mac_address;
+       nm_setting_wireless_get_mac_address_blacklist;
+       nm_setting_wireless_get_mac_blacklist_item;
+       nm_setting_wireless_get_mode;
+       nm_setting_wireless_get_mtu;
+       nm_setting_wireless_get_num_mac_blacklist_items;
+       nm_setting_wireless_get_num_seen_bssids;
+       nm_setting_wireless_get_rate;
+       nm_setting_wireless_get_security;
+       nm_setting_wireless_get_seen_bssid;
+       nm_setting_wireless_get_ssid;
+       nm_setting_wireless_get_tx_power;
+       nm_setting_wireless_get_type;
+       nm_setting_wireless_new;
+       nm_setting_wireless_remove_mac_blacklist_item;
+       nm_setting_wireless_remove_mac_blacklist_item_by_value;
+       nm_setting_wireless_security_add_group;
+       nm_setting_wireless_security_add_pairwise;
+       nm_setting_wireless_security_add_proto;
+       nm_setting_wireless_security_clear_groups;
+       nm_setting_wireless_security_clear_pairwise;
+       nm_setting_wireless_security_clear_protos;
+       nm_setting_wireless_security_error_get_type;
+       nm_setting_wireless_security_error_quark;
+       nm_setting_wireless_security_get_auth_alg;
+       nm_setting_wireless_security_get_group;
+       nm_setting_wireless_security_get_key_mgmt;
+       nm_setting_wireless_security_get_leap_password;
+       nm_setting_wireless_security_get_leap_password_flags;
+       nm_setting_wireless_security_get_leap_username;
+       nm_setting_wireless_security_get_num_groups;
+       nm_setting_wireless_security_get_num_pairwise;
+       nm_setting_wireless_security_get_num_protos;
+       nm_setting_wireless_security_get_pairwise;
+       nm_setting_wireless_security_get_proto;
+       nm_setting_wireless_security_get_psk;
+       nm_setting_wireless_security_get_psk_flags;
+       nm_setting_wireless_security_get_type;
+       nm_setting_wireless_security_get_wep_key;
+       nm_setting_wireless_security_get_wep_key_flags;
+       nm_setting_wireless_security_get_wep_key_type;
+       nm_setting_wireless_security_get_wep_tx_keyidx;
+       nm_setting_wireless_security_new;
+       nm_setting_wireless_security_remove_group;
+       nm_setting_wireless_security_remove_group_by_value;
+       nm_setting_wireless_security_remove_pairwise;
+       nm_setting_wireless_security_remove_pairwise_by_value;
+       nm_setting_wireless_security_remove_proto;
+       nm_setting_wireless_security_remove_proto_by_value;
+       nm_setting_wireless_security_set_wep_key;
+       nm_ssid_get_type;
+       nm_string_array_get_type;
+       nm_uint_array_get_type;
+       nm_util_get_private;
+       nm_utils_ap_mode_security_valid;
+       nm_utils_bin2hexstr;
+       nm_utils_check_virtual_device_compatibility;
+       nm_utils_deinit;
+       nm_utils_escape_ssid;
+       nm_utils_file_is_pkcs12;
+       nm_utils_get_private;
+       nm_utils_gvalue_hash_dup;
+       nm_utils_hex2byte;
+       nm_utils_hexstr2bin;
+       nm_utils_hwaddr_atoba;
+       nm_utils_hwaddr_aton;
+       nm_utils_hwaddr_aton_len;
+       nm_utils_hwaddr_len;
+       nm_utils_hwaddr_ntoa;
+       nm_utils_hwaddr_ntoa_len;
+       nm_utils_hwaddr_type;
+       nm_utils_hwaddr_valid;
+       nm_utils_iface_valid_name;
+       nm_utils_inet4_ntop;
+       nm_utils_inet6_ntop;
+       nm_utils_init;
+       nm_utils_ip4_addresses_from_gvalue;
+       nm_utils_ip4_addresses_to_gvalue;
+       nm_utils_ip4_get_default_prefix;
+       nm_utils_ip4_netmask_to_prefix;
+       nm_utils_ip4_prefix_to_netmask;
+       nm_utils_ip4_routes_from_gvalue;
+       nm_utils_ip4_routes_to_gvalue;
+       nm_utils_ip6_addresses_from_gvalue;
+       nm_utils_ip6_addresses_to_gvalue;
+       nm_utils_ip6_dns_from_gvalue;
+       nm_utils_ip6_dns_to_gvalue;
+       nm_utils_ip6_routes_from_gvalue;
+       nm_utils_ip6_routes_to_gvalue;
+       nm_utils_is_empty_ssid;
+       nm_utils_is_uuid;
+       nm_utils_rsa_key_encrypt;
+       nm_utils_rsa_key_encrypt_aes;
+       nm_utils_same_ssid;
+       nm_utils_security_type_get_type;
+       nm_utils_security_valid;
+       nm_utils_slist_free;
+       nm_utils_ssid_to_utf8;
+       nm_utils_uuid_generate;
+       nm_utils_uuid_generate_from_string;
+       nm_utils_wep_key_valid;
+       nm_utils_wifi_channel_to_freq;
+       nm_utils_wifi_find_next_channel;
+       nm_utils_wifi_freq_to_channel;
+       nm_utils_wifi_is_channel_valid;
+       nm_utils_wpa_psk_valid;
+       nm_vlan_flags_get_type;
+       nm_vlan_priority_map_get_type;
+       nm_vpn_connection_get_banner;
+       nm_vpn_connection_get_type;
+       nm_vpn_connection_get_vpn_state;
+       nm_vpn_connection_new;
+       nm_wep_key_type_get_type;
+       nm_wimax_nsp_connection_valid;
+       nm_wimax_nsp_filter_connections;
+       nm_wimax_nsp_get_name;
+       nm_wimax_nsp_get_network_type;
+       nm_wimax_nsp_get_signal_quality;
+       nm_wimax_nsp_get_type;
+       nm_wimax_nsp_network_type_get_type;
+       nm_wimax_nsp_new;
+local:
+       *;
+};
index 711da7f..8a17858 100644 (file)
@@ -1757,12 +1757,12 @@ _nm_client_is_object_path (const char *string)
  * (was set to default value (NULL)).
  *
  * It allows this python code:
- * from gi.repository import NMClient
- * nmclient = NMClient.Client()
+ * from gi.repository import NM
+ * nmclient = NM.Client()
  * print nmclient.get_active_connections()
  *
  * instead of proper
- * nmclient = NMClient.Client().new()
+ * nmclient = NM.Client().new()
  *
  * Note:
  * A nice overview of GObject construction is here:
index 3550677..4eed266 100644 (file)
@@ -428,7 +428,7 @@ nm_object_class_init (NMObjectClass *nm_object_class)
         * Indicates that an error occured while creating an #NMObject object
         * during property handling of @master_object.
         *
-        * Note: Be aware that the signal is private for libnm-glib's internal
+        * Note: Be aware that the signal is private for libnm's internal
         *       use.
         **/
        signals[OBJECT_CREATION_FAILED] =
@@ -876,7 +876,7 @@ object_created (GObject *obj, const char *path, gpointer user_data)
                GError *error;
                error = g_error_new (NM_OBJECT_ERROR,
                                     NM_OBJECT_ERROR_OBJECT_CREATION_FAILURE,
-                                    "Creating object for path '%s' failed in libnm-glib.",
+                                    "Creating object for path '%s' failed in libnm.",
                                     path);
                /* Emit a signal about the error. */
                g_signal_emit (odata->self, signals[OBJECT_CREATION_FAILED], 0, error, path);
index 07348f2..0990d4e 100644 (file)
@@ -64,7 +64,7 @@ typedef struct {
        GObjectClass parent;
 
        /* Signals */
-       /* The "object-creation-failed" signal is PRIVATE for libnm-glib and
+       /* The "object-creation-failed" signal is PRIVATE for libnm and
         * is not meant for any external usage.  It indicates that an error
         * occured during creation of an object.
         */
index ea61977..5b1b338 100644 (file)
@@ -25,7 +25,7 @@
 #include "nm-glib-compat.h"
 #include "NetworkManager.h"
 #include "nm-secret-agent.h"
-#include "nm-glib-enum-types.h"
+#include "nm-enum-types.h"
 #include "nm-dbus-helpers-private.h"
 
 static void impl_secret_agent_get_secrets (NMSecretAgent *self,
index 81bd299..170e8a3 100644 (file)
@@ -24,7 +24,7 @@
 #include <glib.h>
 #include <glib-object.h>
 
-#include <nm-glib-enum-types.h>
+#include <nm-enum-types.h>
 
 G_BEGIN_DECLS
 
diff --git a/libnm/tests/Makefile.am b/libnm/tests/Makefile.am
new file mode 100644 (file)
index 0000000..cda638a
--- /dev/null
@@ -0,0 +1,37 @@
+if ENABLE_TESTS
+
+AM_CPPFLAGS = \
+       -I$(top_srcdir)/include \
+       -I$(top_srcdir)/libnm \
+       -I$(top_builddir)/libnm \
+       -I$(top_srcdir)/libnm-core \
+       -I$(top_builddir)/libnm-core \
+       -DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \
+       -DTEST_NM_SERVICE=\"$(abs_top_srcdir)/tools/test-networkmanager-service.py\" \
+       $(GLIB_CFLAGS) \
+       $(DBUS_CFLAGS)
+
+LDADD = \
+       $(top_builddir)/libnm/libnm.la \
+       $(GLIB_LIBS) \
+       $(DBUS_LIBS)
+
+noinst_PROGRAMS = $(TESTS)
+
+TESTS = test-nm-client test-remote-settings-client
+
+test_nm_client_SOURCES = \
+       common.c \
+       common.h \
+       test-nm-client.c
+
+test_remote_settings_client_SOURCES = \
+       common.c \
+       common.h \
+       test-remote-settings-client.c
+
+TESTS_ENVIRONMENT = $(srcdir)/libnm-test-launch.sh
+
+endif
+
+EXTRA_DIST = libnm-test-launch.sh
diff --git a/libnm/tests/libnm-test-launch.sh b/libnm/tests/libnm-test-launch.sh
new file mode 100755 (executable)
index 0000000..1db656a
--- /dev/null
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+if [ -z "$DBUS_SESSION_BUS_ADDRESS" ]; then
+    exec dbus-launch --exit-with-session "$@"
+else
+    exec "$@"
+fi
index eebf835..141705e 100644 (file)
@@ -177,7 +177,7 @@ test_device_added (void)
                          &info);
        info.quit_count++;
 
-       /* Wait for libnm-glib to find the device */
+       /* Wait for libnm to find the device */
        info.quit_id = g_timeout_add_seconds (5, loop_quit, loop);
        g_main_loop_run (loop);
 
@@ -326,7 +326,7 @@ test_wifi_ap_added_removed (void)
                          &info);
        info.quit_count = 1;
 
-       /* Wait for libnm-glib to find the device */
+       /* Wait for libnm to find the device */
        info.quit_id = g_timeout_add_seconds (5, loop_quit, loop);
        g_main_loop_run (loop);
 
@@ -367,7 +367,7 @@ test_wifi_ap_added_removed (void)
                          &info);
        info.quit_count++;
 
-       /* Wait for libnm-glib to find the AP */
+       /* Wait for libnm to find the AP */
        info.quit_id = g_timeout_add_seconds (5, loop_quit, loop);
        g_main_loop_run (loop);
 
@@ -406,7 +406,7 @@ test_wifi_ap_added_removed (void)
                          &info);
        info.quit_count++;
 
-       /* Wait for libnm-glib to find the AP */
+       /* Wait for libnm to find the AP */
        info.quit_id = g_timeout_add_seconds (5, loop_quit, loop);
        g_main_loop_run (loop);
 
@@ -549,7 +549,7 @@ test_wimax_nsp_added_removed (void)
                          &info);
        info.quit_count = 1;
 
-       /* Wait for libnm-glib to find the device */
+       /* Wait for libnm to find the device */
        info.quit_id = g_timeout_add_seconds (5, loop_quit, loop);
        g_main_loop_run (loop);
 
@@ -590,7 +590,7 @@ test_wimax_nsp_added_removed (void)
                          &info);
        info.quit_count++;
 
-       /* Wait for libnm-glib to find the AP */
+       /* Wait for libnm to find the AP */
        info.quit_id = g_timeout_add_seconds (5, loop_quit, loop);
        g_main_loop_run (loop);
 
@@ -629,7 +629,7 @@ test_wimax_nsp_added_removed (void)
                          &info);
        info.quit_count++;
 
-       /* Wait for libnm-glib to find the AP */
+       /* Wait for libnm to find the AP */
        info.quit_id = g_timeout_add_seconds (5, loop_quit, loop);
        g_main_loop_run (loop);
 
@@ -735,7 +735,7 @@ test_devices_array (void)
                          (GCallback) da_device_added_cb,
                          &info);
 
-       /* Wait for libnm-glib to find the device */
+       /* Wait for libnm to find the device */
        info.quit_id = g_timeout_add_seconds (5, loop_quit, loop);
        g_main_loop_run (loop);
 
@@ -780,7 +780,7 @@ test_devices_array (void)
                          &info);
        info.quit_count = 2;
 
-       /* Wait for libnm-glib to find the device */
+       /* Wait for libnm to find the device */
        info.quit_id = g_timeout_add_seconds (5, loop_quit, loop);
        g_main_loop_run (loop);
 
@@ -887,11 +887,11 @@ main (int argc, char **argv)
 
        loop = g_main_loop_new (NULL, FALSE);
 
-       g_test_add_func ("/libnm-glib/device-added", test_device_added);
-       g_test_add_func ("/libnm-glib/wifi-ap-added-removed", test_wifi_ap_added_removed);
-       g_test_add_func ("/libnm-glib/wimax-nsp-added-removed", test_wimax_nsp_added_removed);
-       g_test_add_func ("/libnm-glib/devices-array", test_devices_array);
-       g_test_add_func ("/libnm-glib/client-manager-running", test_client_manager_running);
+       g_test_add_func ("/libnm/device-added", test_device_added);
+       g_test_add_func ("/libnm/wifi-ap-added-removed", test_wifi_ap_added_removed);
+       g_test_add_func ("/libnm/wimax-nsp-added-removed", test_wimax_nsp_added_removed);
+       g_test_add_func ("/libnm/devices-array", test_devices_array);
+       g_test_add_func ("/libnm/client-manager-running", test_client_manager_running);
 
        return g_test_run ();
 }
index 9de406b..37fd619 100644 (file)
@@ -39,6 +39,33 @@ clients/tui/nmtui-connect.c
 clients/tui/nmtui-edit.c
 clients/tui/nmtui-hostname.c
 clients/tui/nmtui.c
+libnm-core/crypto.c
+libnm-core/crypto_gnutls.c
+libnm-core/crypto_nss.c
+libnm-core/nm-connection.c
+libnm-core/nm-setting-8021x.c
+libnm-core/nm-setting-adsl.c
+libnm-core/nm-setting-bluetooth.c
+libnm-core/nm-setting-bond.c
+libnm-core/nm-setting-bridge-port.c
+libnm-core/nm-setting-bridge.c
+libnm-core/nm-setting-cdma.c
+libnm-core/nm-setting-connection.c
+libnm-core/nm-setting-dcb.c
+libnm-core/nm-setting-gsm.c
+libnm-core/nm-setting-infiniband.c
+libnm-core/nm-setting-ip4-config.c
+libnm-core/nm-setting-ip6-config.c
+libnm-core/nm-setting-olpc-mesh.c
+libnm-core/nm-setting-ppp.c
+libnm-core/nm-setting-pppoe.c
+libnm-core/nm-setting-vlan.c
+libnm-core/nm-setting-vpn.c
+libnm-core/nm-setting-wimax.c
+libnm-core/nm-setting-wired.c
+libnm-core/nm-setting-wireless-security.c
+libnm-core/nm-setting-wireless.c
+libnm-core/nm-setting.c
 libnm-glib/nm-device.c
 libnm-glib/nm-remote-connection.c
 libnm-util/crypto.c
@@ -70,6 +97,9 @@ libnm-util/nm-setting-wired.c
 libnm-util/nm-setting-wireless-security.c
 libnm-util/nm-setting-wireless.c
 libnm-util/nm-utils.c
+libnm/nm-object.c
+libnm/nm-remote-connection.c
+libnm/nm-vpn-plugin.c
 policy/org.freedesktop.NetworkManager.policy.in.in
 src/main.c
 src/dhcp-manager/nm-dhcp-dhclient.c