From 50a58f0fabd8a34c1b6108a107e08abe3c1ccd24 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Tue, 14 Jul 2015 19:38:58 +0200 Subject: Imported Upstream version 1.0.4 --- docs/libnm/html/libnm-nm-version.html | 74 +++++++++++++++++------------------ 1 file changed, 36 insertions(+), 38 deletions(-) (limited to 'docs/libnm/html/libnm-nm-version.html') diff --git a/docs/libnm/html/libnm-nm-version.html b/docs/libnm/html/libnm-nm-version.html index 7cbebd93..99310a5c 100644 --- a/docs/libnm/html/libnm-nm-version.html +++ b/docs/libnm/html/libnm-nm-version.html @@ -2,13 +2,13 @@ -libnm Reference Manual: nm-version +nm-version: libnm Reference Manual - + @@ -77,6 +77,14 @@ #define +NM_VERSION_1_0_2 + + +#define +NM_VERSION_1_0_4 + + +#define NM_VERSION_MIN_REQUIRED @@ -130,13 +138,15 @@ #define NM_AVAILABLE_IN_1_0 + +#define +NM_AVAILABLE_IN_1_0_4 +

Description

-

-

Functions

@@ -158,7 +168,7 @@ is compiled against.

NM_MICRO_VERSION

-
#define NM_MICRO_VERSION (2)
+
#define NM_MICRO_VERSION (4)
 

 
Evaluates to the micro version number of NetworkManager which this source
 compiled against.

@@ -198,7 +208,6 @@ compiled against.

 
Returns

 
 TRUE if the version of the NetworkManager header files
 is the same as or newer than the passed-in version.

-
@@ -206,119 +215,108 @@ is the same as or newer than the passed-in version.

NM_ENCODE_VERSION()

#define NM_ENCODE_VERSION(major,minor,micro) ((major) << 16 | (minor) << 8 | (micro))
-

-

NM_VERSION_0_9_8

#define NM_VERSION_0_9_8  (NM_ENCODE_VERSION (0, 9, 8))
-

-

NM_VERSION_0_9_10

#define NM_VERSION_0_9_10 (NM_ENCODE_VERSION (0, 9, 10))
-

-

NM_VERSION_1_0

#define NM_VERSION_1_0    (NM_ENCODE_VERSION (1, 0, 0))
-

-

+
+
+
+

NM_VERSION_1_0_2

+
#define NM_VERSION_1_0_2  (NM_ENCODE_VERSION (1, 0, 2))
+
+
+
+
+

NM_VERSION_1_0_4

+
#define NM_VERSION_1_0_4  (NM_ENCODE_VERSION (1, 0, 4))
+

NM_VERSION_MIN_REQUIRED

# define NM_VERSION_MIN_REQUIRED (NM_VERSION_CUR_STABLE)
-

-

NM_VERSION_MAX_ALLOWED

# define NM_VERSION_MAX_ALLOWED (NM_VERSION_CUR_STABLE)
-

-

NM_DEPRECATED_IN_0_9_10_FOR()

# define NM_DEPRECATED_IN_0_9_10_FOR(f) G_DEPRECATED_FOR(f)
-

-

NM_DEPRECATED_IN_1_0_FOR()

# define NM_DEPRECATED_IN_1_0_FOR(f)    G_DEPRECATED_FOR(f)
-

-

Types and Values

NM_VERSION_CUR_STABLE

-
#define NM_VERSION_CUR_STABLE  NM_VERSION_1_0
+
#define NM_VERSION_CUR_STABLE  NM_VERSION_1_0_2
 

-

-

NM_VERSION_NEXT_STABLE

-
#define NM_VERSION_NEXT_STABLE NM_VERSION_1_0
+
#define NM_VERSION_NEXT_STABLE NM_VERSION_1_0_4
 

-

-

NM_DEPRECATED_IN_0_9_10

# define NM_DEPRECATED_IN_0_9_10        G_DEPRECATED
-

-

NM_DEPRECATED_IN_1_0

# define NM_DEPRECATED_IN_1_0           G_DEPRECATED
-

-

NM_AVAILABLE_IN_0_9_10

# define NM_AVAILABLE_IN_0_9_10         G_UNAVAILABLE(0.9,10)
-

-

NM_AVAILABLE_IN_1_0

# define NM_AVAILABLE_IN_1_0            G_UNAVAILABLE(1,0)
-

-

+
+
+
+

NM_AVAILABLE_IN_1_0_4

+
# define NM_AVAILABLE_IN_1_0_4          G_UNAVAILABLE(1,0.4)
+
-
- Generated by GTK-Doc V1.21
+
Generated by GTK-Doc V1.24 \ No newline at end of file -- cgit 1.3.0-6-gf8a5