Imported Upstream version 1.1.93 upstream/1.1.93

8 files changed, 21 insertions, 54 deletions

diff --git a/libnm/Makefile.am b/libnm/Makefile.am
index 80cdccb0..e035b3cd 100644
--- a/libnm/Makefile.am
+++ b/libnm/Makefile.am
@@ -1,5 +1,7 @@
 include $(GLIB_MAKEFILE)
 
+@GNOME_CODE_COVERAGE_RULES@
+
 SUBDIRS = . tests
 
 AM_CPPFLAGS = \
@@ -12,10 +14,10 @@ AM_CPPFLAGS = \
 	-I$(top_builddir)/libnm \
 	-DG_LOG_DOMAIN=\""libnm"\" \
 	-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIB \
-	-DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \
 	$(GLIB_CFLAGS) \
 	$(GUDEV_CFLAGS) \
-	-DNMRUNDIR=\"$(nmrundir)\"
+	-DNMRUNDIR=\"$(nmrundir)\" \
+	$(CODE_COVERAGE_CFLAGS)
 
 include $(top_srcdir)/libnm-core/Makefile.libnm-core
 
@@ -130,7 +132,7 @@ libnm_la_SOURCES =			\
 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
+GLIB_MKENUMS_C_FLAGS = --identifier-prefix NM --fhead '\#include "nm-default.h"\n'
 
 libnm_la_LIBADD = \
 	$(top_builddir)/libnm-core/libnm-core.la \
@@ -139,6 +141,9 @@ libnm_la_LIBADD = \
 	$(UUID_LIBS) \
 	$(GUDEV_LIBS)
 
+libnm_la_LDFLAGS = \
+	$(CODE_COVERAGE_LDFLAGS)
+
 SYMBOL_VIS_FILE=$(srcdir)/libnm.ver
 
 libnm_la_LDFLAGS = -Wl,--version-script=$(SYMBOL_VIS_FILE) \
diff --git a/libnm/Makefile.in b/libnm/Makefile.in
index 81d1aa4a..899dd6da 100644
--- a/libnm/Makefile.in
+++ b/libnm/Makefile.in
@@ -564,10 +564,10 @@ AM_CPPFLAGS = \
 	-I$(top_builddir)/libnm \
 	-DG_LOG_DOMAIN=\""libnm"\" \
 	-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIB \
-	-DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \
 	$(GLIB_CFLAGS) \
 	$(GUDEV_CFLAGS) \
-	-DNMRUNDIR=\"$(nmrundir)\"
+	-DNMRUNDIR=\"$(nmrundir)\" \
+	$(CODE_COVERAGE_CFLAGS)
 
 core = $(top_srcdir)/libnm-core
 core_build = $(top_builddir)/libnm-core
@@ -786,7 +786,7 @@ libnm_la_SOURCES = \
 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
+GLIB_MKENUMS_C_FLAGS = --identifier-prefix NM --fhead '\#include "nm-default.h"\n'
 libnm_la_LIBADD = \
 	$(top_builddir)/libnm-core/libnm-core.la \
 	$(top_builddir)/introspection/libnmdbus.la \
@@ -794,10 +794,10 @@ libnm_la_LIBADD = \
 	$(UUID_LIBS) \
 	$(GUDEV_LIBS)
 
-SYMBOL_VIS_FILE = $(srcdir)/libnm.ver
 libnm_la_LDFLAGS = -Wl,--version-script=$(SYMBOL_VIS_FILE) \
 	-version-info "1:0:1"
 
+SYMBOL_VIS_FILE = $(srcdir)/libnm.ver
 
 ###
 BUILT_SOURCES = $(GLIB_GENERATED)
@@ -1370,6 +1370,8 @@ uninstall-am: uninstall-girDATA uninstall-libLTLIBRARIES \
 
 include $(GLIB_MAKEFILE)
 
+@GNOME_CODE_COVERAGE_RULES@
+
 -include $(INTROSPECTION_MAKEFILE)
 
 @HAVE_INTROSPECTION_TRUE@NM-1.0.gir: libnm.la
diff --git a/libnm/nm-enum-types.c b/libnm/nm-enum-types.c
index e10e9f78..b27ccd73 100644
--- a/libnm/nm-enum-types.c
+++ b/libnm/nm-enum-types.c
@@ -6,6 +6,7 @@
 #include "config.h"
 
 #include "nm-enum-types.h"
+#include "nm-default.h"
 
 #include "nm-version-macros.h" 
 #include "NetworkManager.h" 
@@ -113,27 +114,6 @@ nm_client_error_get_type (void)
 
   return g_define_type_id__volatile;
 }
-GType
-nm_wimax_nsp_network_type_get_type (void)
-{
-  static volatile gsize g_define_type_id__volatile = 0;
-
-  if (g_once_init_enter (&g_define_type_id__volatile))
-    {
-      static const GEnumValue values[] = {
-        { NM_WIMAX_NSP_NETWORK_TYPE_UNKNOWN, "NM_WIMAX_NSP_NETWORK_TYPE_UNKNOWN", "unknown" },
-        { NM_WIMAX_NSP_NETWORK_TYPE_HOME, "NM_WIMAX_NSP_NETWORK_TYPE_HOME", "home" },
-        { NM_WIMAX_NSP_NETWORK_TYPE_PARTNER, "NM_WIMAX_NSP_NETWORK_TYPE_PARTNER", "partner" },
-        { NM_WIMAX_NSP_NETWORK_TYPE_ROAMING_PARTNER, "NM_WIMAX_NSP_NETWORK_TYPE_ROAMING_PARTNER", "roaming-partner" },
-        { 0, NULL, NULL }
-      };
-      GType g_define_type_id =
-        g_enum_register_static (g_intern_static_string ("NMWimaxNspNetworkType"), values);
-      g_once_init_leave (&g_define_type_id__volatile, g_define_type_id);
-    }
-
-  return g_define_type_id__volatile;
-}
 
 
 
diff --git a/libnm/nm-enum-types.h b/libnm/nm-enum-types.h
index 93d9eb8e..451c6964 100644
--- a/libnm/nm-enum-types.h
+++ b/libnm/nm-enum-types.h
@@ -16,8 +16,6 @@ GType nm_client_permission_result_get_type (void) G_GNUC_CONST;
 #define NM_TYPE_CLIENT_PERMISSION_RESULT (nm_client_permission_result_get_type ())
 GType nm_client_error_get_type (void) G_GNUC_CONST;
 #define NM_TYPE_CLIENT_ERROR (nm_client_error_get_type ())
-GType nm_wimax_nsp_network_type_get_type (void) G_GNUC_CONST;
-#define NM_TYPE_WIMAX_NSP_NETWORK_TYPE (nm_wimax_nsp_network_type_get_type ())
 G_END_DECLS
 
 #endif /* __NM_ENUM_TYPES_H__ */
diff --git a/libnm/nm-keyfile-docs.xml b/libnm/nm-keyfile-docs.xml
index 663f8a2e..33635aa7 100644
--- a/libnm/nm-keyfile-docs.xml
+++ b/libnm/nm-keyfile-docs.xml
@@ -14,7 +14,7 @@
 <setting name="bridge-port">
 </setting>
 <setting name="bridge">
-<property name="mac-address" variable="mac-address" format="ususal hex-digits-and-colons notation" values="" default="" example="mac-address=00:22:68:12:79:A2
+<property name="mac-address" variable="mac-address" format="usual hex-digits-and-colons notation" values="" default="" example="mac-address=00:22:68:12:79:A2
 mac-address=0;34;104;18;121;162;" description="MAC address in traditional hex-digits-and-colons notation,
 or semicolon separated list of 6 decimal bytes (obsolete)"/>
 </setting>
@@ -29,7 +29,7 @@ or semicolon separated list of 6 decimal bytes (obsolete)"/>
 <setting name="gsm">
 </setting>
 <setting name="infiniband">
-<property name="mac-address" variable="mac-address" format="ususal hex-digits-and-colons notation" values="" default="" example="mac-address= 80:00:00:6d:fe:80:00:00:00:00:00:00:00:02:55:00:70:33:cf:01" description="MAC address in traditional hex-digits-and-colons notation, or
+<property name="mac-address" variable="mac-address" format="usual hex-digits-and-colons notation" values="" default="" example="mac-address= 80:00:00:6d:fe:80:00:00:00:00:00:00:00:02:55:00:70:33:cf:01" description="MAC address in traditional hex-digits-and-colons notation, or
 or semicolon separated list of 20 decimal bytes (obsolete)"/>
 </setting>
 <setting name="">
@@ -81,10 +81,10 @@ under [vpn-secrets] section."/>
 <setting name="wimax">
 </setting>
 <setting name="802-3-ethernet">
-<property name="mac-address" variable="mac-address" format="ususal hex-digits-and-colons notation" values="" default="" example="" description="MAC address in traditional hex-digits-and-colons notation
+<property name="mac-address" variable="mac-address" format="usual hex-digits-and-colons notation" values="" default="" example="" description="MAC address in traditional hex-digits-and-colons notation
 (e.g. 00:22:68:12:79:A2), or semicolon separated list of 6 bytes (obsolete)
 (e.g. 0;34;104;18;121;162)"/>
-<property name="cloned-mac-address" variable="cloned-mac-address" format="ususal hex-digits-and-colons notation" values="" default="" example="" description="Cloned MAC address in traditional hex-digits-and-colons notation
+<property name="cloned-mac-address" variable="cloned-mac-address" format="usual hex-digits-and-colons notation" values="" default="" example="" description="Cloned MAC address in traditional hex-digits-and-colons notation
 (e.g. 00:22:68:12:79:B2), or semicolon separated list of 6 bytes (obsolete)
 (e.g. 0;34;104;18;121;178)."/>
 <property name="mac-address-blacklist" variable="mac-address-blacklist" format="list of MACs (separated with semicolons)" values="" default="" example="mac-address-blacklist= 00:22:68:12:79:A6;00:22:68:12:79:78" description="MAC address blacklist."/>
@@ -93,10 +93,10 @@ under [vpn-secrets] section."/>
 </setting>
 <setting name="802-11-wireless">
 <property name="ssid" variable="ssid" format="string (or decimal-byte list - obsolete)" values="" default="" example="ssid=Quick Net" description="SSID of Wi-Fi network."/>
-<property name="mac-address" variable="mac-address" format="ususal hex-digits-and-colons notation" values="" default="" example="" description="MAC address in traditional hex-digits-and-colons notation
+<property name="mac-address" variable="mac-address" format="usual hex-digits-and-colons notation" values="" default="" example="" description="MAC address in traditional hex-digits-and-colons notation
 (e.g. 00:22:68:12:79:A2), or semicolon separated list of 6 bytes (obsolete)
 (e.g. 0;34;104;18;121;162)."/>
-<property name="cloned-mac-address" variable="cloned-mac-address" format="ususal hex-digits-and-colons notation" values="" default="" example="" description="Cloned MAC address in traditional hex-digits-and-colons notation
+<property name="cloned-mac-address" variable="cloned-mac-address" format="usual hex-digits-and-colons notation" values="" default="" example="" description="Cloned MAC address in traditional hex-digits-and-colons notation
 (e.g. 00:22:68:12:79:B2), or semicolon separated list of 6 bytes (obsolete)
 (e.g. 0;34;104;18;121;178)."/>
 <property name="mac-address-blacklist" variable="mac-address-blacklist" format="list of MACs (separated with semicolons)" values="" default="" example="mac-address-blacklist= 00:22:68:12:79:A6;00:22:68:12:79:78" description="MAC address blacklist."/>
diff --git a/libnm/nm-wimax-nsp.h b/libnm/nm-wimax-nsp.h
index cdc7b236..5dd982ef 100644
--- a/libnm/nm-wimax-nsp.h
+++ b/libnm/nm-wimax-nsp.h
@@ -41,22 +41,6 @@ G_BEGIN_DECLS
 #define NM_WIMAX_NSP_SIGNAL_QUALITY "signal-quality"
 #define NM_WIMAX_NSP_NETWORK_TYPE   "network-type"
 
-/**
- * NMWimaxNspNetworkType:
- * @NM_WIMAX_NSP_NETWORK_TYPE_UNKNOWN: unknown network type
- * @NM_WIMAX_NSP_NETWORK_TYPE_HOME: home network
- * @NM_WIMAX_NSP_NETWORK_TYPE_PARTNER: partner network
- * @NM_WIMAX_NSP_NETWORK_TYPE_ROAMING_PARTNER: roaming partner network
- *
- * WiMAX network type.
- */
-typedef enum {
-	NM_WIMAX_NSP_NETWORK_TYPE_UNKNOWN         = 0,
-	NM_WIMAX_NSP_NETWORK_TYPE_HOME            = 1,
-	NM_WIMAX_NSP_NETWORK_TYPE_PARTNER         = 2,
-	NM_WIMAX_NSP_NETWORK_TYPE_ROAMING_PARTNER = 3
-} NMWimaxNspNetworkType;
-
 struct _NMWimaxNsp {
 	NMObject parent;
 };
diff --git a/libnm/tests/Makefile.am b/libnm/tests/Makefile.am
index fd9edb6f..d2944c4c 100644
--- a/libnm/tests/Makefile.am
+++ b/libnm/tests/Makefile.am
@@ -8,7 +8,6 @@ AM_CPPFLAGS = \
 	-I$(top_srcdir)/libnm-core \
 	-I$(top_builddir)/libnm-core \
 	-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIB \
-	-DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \
 	-DTEST_NM_SERVICE=\"$(abs_top_srcdir)/tools/test-networkmanager-service.py\" \
 	$(GLIB_CFLAGS)
 
diff --git a/libnm/tests/Makefile.in b/libnm/tests/Makefile.in
index 455a0761..15846792 100644
--- a/libnm/tests/Makefile.in
+++ b/libnm/tests/Makefile.in
@@ -701,7 +701,6 @@ with_valgrind = @with_valgrind@
 @ENABLE_TESTS_TRUE@	-I$(top_srcdir)/libnm-core \
 @ENABLE_TESTS_TRUE@	-I$(top_builddir)/libnm-core \
 @ENABLE_TESTS_TRUE@	-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIB \
-@ENABLE_TESTS_TRUE@	-DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \
 @ENABLE_TESTS_TRUE@	-DTEST_NM_SERVICE=\"$(abs_top_srcdir)/tools/test-networkmanager-service.py\" \
 @ENABLE_TESTS_TRUE@	$(GLIB_CFLAGS)