From 9c202e3e860b3be9e1f8882630b69affbb130102 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Sun, 3 Feb 2013 14:49:22 +0100 Subject: Imported Upstream version 0.9.7.995 --- docs/libnm-glib/html/NMAccessPoint.html | 4 +- docs/libnm-glib/html/NMClient.html | 10 +- docs/libnm-glib/html/NMDevice.html | 1 + docs/libnm-glib/html/NMDeviceBond.html | 4 +- docs/libnm-glib/html/NMDeviceBridge.html | 331 +++++++++++++++++++++++++++ docs/libnm-glib/html/NMDeviceInfiniband.html | 4 +- docs/libnm-glib/html/NMDeviceWifi.html | 2 +- docs/libnm-glib/html/NMSecretAgent.html | 20 +- docs/libnm-glib/html/api-index-full.html | 60 +++++ docs/libnm-glib/html/ch02.html | 5 +- docs/libnm-glib/html/index.html | 7 +- docs/libnm-glib/html/index.sgml | 27 +++ docs/libnm-glib/html/libnm-glib.devhelp2 | 20 ++ docs/libnm-glib/html/object-tree.html | 1 + 14 files changed, 480 insertions(+), 16 deletions(-) create mode 100644 docs/libnm-glib/html/NMDeviceBridge.html (limited to 'docs/libnm-glib/html') diff --git a/docs/libnm-glib/html/NMAccessPoint.html b/docs/libnm-glib/html/NMAccessPoint.html index 4b43358c..a205b980 100644 --- a/docs/libnm-glib/html/NMAccessPoint.html +++ b/docs/libnm-glib/html/NMAccessPoint.html @@ -597,7 +597,9 @@ The maximum bit rate of the access point.

The "mode" property

  "mode"                     guint                 : Read

-The mode of the access point. +The mode of the access point; either "infrastructure" (a central +coordinator of the wireless network allowing clients to connect) or +"ad-hoc" (a network with no central controller).

Allowed values: [1,2]

Default value: 2

diff --git a/docs/libnm-glib/html/NMClient.html b/docs/libnm-glib/html/NMClient.html index 3e02012b..cb771ba8 100644 --- a/docs/libnm-glib/html/NMClient.html +++ b/docs/libnm-glib/html/NMClient.html @@ -685,7 +685,10 @@ Gets a

nm_client_get_devices ()

const GPtrArray *   nm_client_get_devices               (NMClient *client);

-Gets all the detected devices. +Gets all the known network devices. Use nm_device_get_type() or the +NM_IS_DEVICE_XXXX() functions to determine what kind of device member of the +returned array is, and then you may use device-specific methods such as +nm_device_ethernet_get_hw_address().

@@ -697,8 +700,9 @@ Gets all the detected devices. - diff --git a/docs/libnm-glib/html/NMDevice.html b/docs/libnm-glib/html/NMDevice.html index fd8061ce..86536c2c 100644 --- a/docs/libnm-glib/html/NMDevice.html +++ b/docs/libnm-glib/html/NMDevice.html @@ -122,6 +122,7 @@ const char * NMDeviceAdsl +----NMDeviceInfiniband +----NMDeviceBond + +----NMDeviceBridge +----NMDeviceVlan diff --git a/docs/libnm-glib/html/NMDeviceBond.html b/docs/libnm-glib/html/NMDeviceBond.html index 9cb2c551..9f08c415 100644 --- a/docs/libnm-glib/html/NMDeviceBond.html +++ b/docs/libnm-glib/html/NMDeviceBond.html @@ -7,7 +7,7 @@ - + @@ -18,7 +18,7 @@ - +

Returns :

a GPtrArray containing all the NMDevices. -The returned array is owned by the client and should not be modified. [transfer none][element-type NMClient.Device] +a GPtrArray +containing all the NMDevices. The returned array is owned by the +NMClient object and should not be modified. [transfer none][element-type NMClient.Device]
Up Home libnm-glib Reference ManualNextNext
Top diff --git a/docs/libnm-glib/html/NMDeviceBridge.html b/docs/libnm-glib/html/NMDeviceBridge.html new file mode 100644 index 00000000..4a9b431f --- /dev/null +++ b/docs/libnm-glib/html/NMDeviceBridge.html @@ -0,0 +1,331 @@ + + + + +NMDeviceBridge + + + + + + + + + + + + + + + + + + + +
+
+
+ + +
+

NMDeviceBridge

+

NMDeviceBridge

+
+
+

Synopsis

+
                    NMDeviceBridge;
+                    NMDeviceBridgeClass;
+enum                NMDeviceBridgeError;
+#define             NM_DEVICE_BRIDGE_CARRIER
+#define             NM_DEVICE_BRIDGE_ERROR
+#define             NM_DEVICE_BRIDGE_HW_ADDRESS
+#define             NM_DEVICE_BRIDGE_SLAVES
+GQuark              nm_device_bridge_error_quark        (void);
+gboolean            nm_device_bridge_get_carrier        (NMDeviceBridge *device);
+const char *        nm_device_bridge_get_hw_address     (NMDeviceBridge *device);
+const GPtrArray *   nm_device_bridge_get_slaves         (NMDeviceBridge *device);
+GObject *           nm_device_bridge_new                (DBusGConnection *connection,
+                                                         const char *path);
+
+
+
+

Object Hierarchy

+
+  GObject
+   +----NMObject
+         +----NMDevice
+               +----NMDeviceBridge
+
+
+
+

Implemented Interfaces

+

+NMDeviceBridge implements + GInitable and GAsyncInitable.

+
+
+

Properties

+
+  "carrier"                  gboolean              : Read
+  "hw-address"               gchar*                : Read
+  "slaves"                   NMObjectArray*        : Read
+
+
+
+

Description

+

+

+
+
+

Details

+
+

NMDeviceBridge

+
typedef struct _NMDeviceBridge NMDeviceBridge;
+

+

+
+
+
+

NMDeviceBridgeClass

+
typedef struct {
+	NMDeviceClass parent;
+
+	/* Padding for future expansion */
+	void (*_reserved1) (void);
+	void (*_reserved2) (void);
+	void (*_reserved3) (void);
+	void (*_reserved4) (void);
+	void (*_reserved5) (void);
+	void (*_reserved6) (void);
+} NMDeviceBridgeClass;
+
+

+

+
+
+
+

enum NMDeviceBridgeError

+
typedef enum {
+	NM_DEVICE_BRIDGE_ERROR_UNKNOWN = 0,               /*< nick=UnknownError >*/
+	NM_DEVICE_BRIDGE_ERROR_NOT_BRIDGE_CONNECTION,     /*< nick=NotBridgeConnection >*/
+	NM_DEVICE_BRIDGE_ERROR_INVALID_BRIDGE_CONNECTION, /*< nick=InvalidBridgeConnection >*/
+	NM_DEVICE_BRIDGE_ERROR_INTERFACE_MISMATCH,        /*< nick=InterfaceMismatch >*/
+} NMDeviceBridgeError;
+
+
++ + + + + + + + + + + + + + + + + + +

NM_DEVICE_BRIDGE_ERROR_UNKNOWN

unknown or unclassified error +

NM_DEVICE_BRIDGE_ERROR_NOT_BRIDGE_CONNECTION

the connection was not of bridge type +

NM_DEVICE_BRIDGE_ERROR_INVALID_BRIDGE_CONNECTION

the bridge connection was invalid +

NM_DEVICE_BRIDGE_ERROR_INTERFACE_MISMATCH

the interfaces of the connection and the device mismatched +
+
+
+
+

NM_DEVICE_BRIDGE_CARRIER

+
#define NM_DEVICE_BRIDGE_CARRIER     "carrier"
+
+

+

+
+
+
+

NM_DEVICE_BRIDGE_ERROR

+
#define NM_DEVICE_BRIDGE_ERROR nm_device_bridge_error_quark ()
+
+

+

+
+
+
+

NM_DEVICE_BRIDGE_HW_ADDRESS

+
#define NM_DEVICE_BRIDGE_HW_ADDRESS  "hw-address"
+
+

+

+
+
+
+

NM_DEVICE_BRIDGE_SLAVES

+
#define NM_DEVICE_BRIDGE_SLAVES      "slaves"
+
+

+

+
+
+
+

nm_device_bridge_error_quark ()

+
GQuark              nm_device_bridge_error_quark        (void);
+

+Registers an error quark for NMDeviceBridge if necessary. +

+
++ + + + +

Returns :

the error quark used for NMDeviceBridge errors.
+
+
+
+

nm_device_bridge_get_carrier ()

+
gboolean            nm_device_bridge_get_carrier        (NMDeviceBridge *device);
+

+Whether the device has carrier. +

+
++ + + + + + + + + + +

device :

a NMDeviceBridge +

Returns :

 +TRUE if the device has carrier
+
+
+
+

nm_device_bridge_get_hw_address ()

+
const char *        nm_device_bridge_get_hw_address     (NMDeviceBridge *device);
+

+Gets the hardware (MAC) address of the NMDeviceBridge +

+
++ + + + + + + + + + +

device :

a NMDeviceBridge +

Returns :

the hardware address. This is the internal string used by the +device, and must not be modified.
+
+
+
+

nm_device_bridge_get_slaves ()

+
const GPtrArray *   nm_device_bridge_get_slaves         (NMDeviceBridge *device);
+

+Gets the devices currently slaved to device. +

+
++ + + + + + + + + + +

device :

a NMDeviceBridge +

Returns :

the GPtrArray containing +NMDevices that are slaves of device. This is the internal +copy used by the device, and must not be modified. [element-type NMClient.Device] +
+
+
+
+

nm_device_bridge_new ()

+
GObject *           nm_device_bridge_new                (DBusGConnection *connection,
+                                                         const char *path);
+

+Creates a new NMDeviceBridge. +

+
++ + + + + + + + + + + + + + +

connection :

the DBusGConnection +

path :

the DBus object path of the device

Returns :

a new device. [transfer full] +
+
+
+
+

Property Details

+
+

The "carrier" property

+
  "carrier"                  gboolean              : Read
+

+Whether the device has carrier. +

+

Default value: FALSE

+
+
+
+

The "hw-address" property

+
  "hw-address"               gchar*                : Read
+

+The hardware (MAC) address of the device. +

+

Default value: NULL

+
+
+
+

The "slaves" property

+
  "slaves"                   NMObjectArray*        : Read
+

+The devices (NMDevice) slaved to the bridge device. +

+
+
+
+
+
+ Generated by GTK-Doc V1.18
+ + \ No newline at end of file diff --git a/docs/libnm-glib/html/NMDeviceInfiniband.html b/docs/libnm-glib/html/NMDeviceInfiniband.html index c4253e5d..4b0b5791 100644 --- a/docs/libnm-glib/html/NMDeviceInfiniband.html +++ b/docs/libnm-glib/html/NMDeviceInfiniband.html @@ -6,7 +6,7 @@ - + @@ -14,7 +14,7 @@ - + diff --git a/docs/libnm-glib/html/NMDeviceWifi.html b/docs/libnm-glib/html/NMDeviceWifi.html index e41712f3..d4976feb 100644 --- a/docs/libnm-glib/html/NMDeviceWifi.html +++ b/docs/libnm-glib/html/NMDeviceWifi.html @@ -523,7 +523,7 @@ The hardware (MAC) address of the device.

The mode of the device.

-

Allowed values: <= 2

+

Allowed values: <= 3

Default value: 2

diff --git a/docs/libnm-glib/html/NMSecretAgent.html b/docs/libnm-glib/html/NMSecretAgent.html index 61a4048a..e18588c4 100644 --- a/docs/libnm-glib/html/NMSecretAgent.html +++ b/docs/libnm-glib/html/NMSecretAgent.html @@ -214,7 +214,11 @@ should be called. - + @@ -352,7 +356,7 @@ To easily create the hash table to return the WiFi PSK, you could do something like this:

-

Example 1. Creating a secrets hash

+

Example 1. Creating a secrets hash

@@ -406,7 +410,11 @@ something like this: - + @@ -451,7 +459,11 @@ should be called. - + diff --git a/docs/libnm-glib/html/api-index-full.html b/docs/libnm-glib/html/api-index-full.html index 93e2532e..d344affc 100644 --- a/docs/libnm-glib/html/api-index-full.html +++ b/docs/libnm-glib/html/api-index-full.html @@ -651,6 +651,30 @@
+NMDeviceBridge, struct in NMDeviceBridge +
+
+
+NMDeviceBridge:carrier, object property in NMDeviceBridge +
+
+
+NMDeviceBridge:hw-address, object property in NMDeviceBridge +
+
+
+NMDeviceBridge:slaves, object property in NMDeviceBridge +
+
+
+NMDeviceBridgeClass, struct in NMDeviceBridge +
+
+
+NMDeviceBridgeError, enum in NMDeviceBridge +
+
+
NMDeviceBt, struct in NMDeviceBt
@@ -955,6 +979,42 @@
+NM_DEVICE_BRIDGE_CARRIER, macro in NMDeviceBridge +
+
+
+NM_DEVICE_BRIDGE_ERROR, macro in NMDeviceBridge +
+
+
+nm_device_bridge_error_quark, function in NMDeviceBridge +
+
+
+nm_device_bridge_get_carrier, function in NMDeviceBridge +
+
+
+nm_device_bridge_get_hw_address, function in NMDeviceBridge +
+
+
+nm_device_bridge_get_slaves, function in NMDeviceBridge +
+
+
+NM_DEVICE_BRIDGE_HW_ADDRESS, macro in NMDeviceBridge +
+
+
+nm_device_bridge_new, function in NMDeviceBridge +
+
+
+NM_DEVICE_BRIDGE_SLAVES, macro in NMDeviceBridge +
+
+
NM_DEVICE_BT_CAPABILITIES, macro in NMDeviceBt
diff --git a/docs/libnm-glib/html/ch02.html b/docs/libnm-glib/html/ch02.html index fa143784..2a334ea9 100644 --- a/docs/libnm-glib/html/ch02.html +++ b/docs/libnm-glib/html/ch02.html @@ -21,7 +21,7 @@

connection :

the connection for which secrets were requestedthe connection for which secrets were requested, +note that this object will be unrefed after the callback has returned, use +g_object_ref()/g_object_unref() if you want to use this object after the callback +has returned. [transfer none] +

secrets :

connection :

the connection for which secrets were to be savedthe connection for which secrets were to be saved, +note that this object will be unrefed after the callback has returned, use +g_object_ref()/g_object_unref() if you want to use this object after the callback +has returned. [transfer none] +

error :

-libnm-glib API Reference

+libnm-glib API Reference
NMClient @@ -54,6 +54,9 @@ NMDeviceBond
+NMDeviceBridge +
+
NMDeviceInfiniband
diff --git a/docs/libnm-glib/html/index.html b/docs/libnm-glib/html/index.html index a0375d4e..339a581c 100644 --- a/docs/libnm-glib/html/index.html +++ b/docs/libnm-glib/html/index.html @@ -15,14 +15,14 @@

- for libnm-glib 0.9.6.4 + for libnm-glib 0.9.7.995 The latest version of this documentation can be found on-line at http://projects.gnome.org/NetworkManager/developers/libnm-glib/09/.

Copyright © 2012 The NetworkManager Authors

-

+

Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License, Version 1.1 or any later @@ -81,6 +81,9 @@ NMDeviceBond

+NMDeviceBridge +
+
NMDeviceInfiniband
diff --git a/docs/libnm-glib/html/index.sgml b/docs/libnm-glib/html/index.sgml index cc8e3b43..92276d7d 100644 --- a/docs/libnm-glib/html/index.sgml +++ b/docs/libnm-glib/html/index.sgml @@ -419,6 +419,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/docs/libnm-glib/html/libnm-glib.devhelp2 b/docs/libnm-glib/html/libnm-glib.devhelp2 index 7f2a66e7..3cf09621 100644 --- a/docs/libnm-glib/html/libnm-glib.devhelp2 +++ b/docs/libnm-glib/html/libnm-glib.devhelp2 @@ -14,6 +14,7 @@ + @@ -319,6 +320,21 @@ + + + + + + + + + + + + + + + @@ -631,6 +647,10 @@ + + + + diff --git a/docs/libnm-glib/html/object-tree.html b/docs/libnm-glib/html/object-tree.html index ae88a436..0488f18b 100644 --- a/docs/libnm-glib/html/object-tree.html +++ b/docs/libnm-glib/html/object-tree.html @@ -36,6 +36,7 @@ NMDeviceAdsl NMDeviceInfiniband NMDeviceBond + NMDeviceBridge NMDeviceVlan NMWimaxNsp NMAccessPoint -- cgit 1.3.0-6-gf8a5