From 36cb2f364a821e1be50b23e03a18891ec55adb06 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Fri, 26 Oct 2012 21:32:57 +0200 Subject: Imported Upstream version 0.9.6.4 --- docs/libnm-glib/Makefile.in | 24 ++++++++++++++++- docs/libnm-glib/html/NMDeviceAdsl.html | 3 ++- docs/libnm-glib/html/NMDeviceBond.html | 45 ++++++++++++++++++++++++++++++++ docs/libnm-glib/html/NMSecretAgent.html | 4 +-- docs/libnm-glib/html/api-index-full.html | 12 +++++++++ docs/libnm-glib/html/ch02.html | 2 +- docs/libnm-glib/html/index.html | 4 +-- docs/libnm-glib/html/index.sgml | 3 +++ docs/libnm-glib/html/libnm-glib.devhelp2 | 3 +++ docs/libnm-glib/libnm-glib-sections.txt | 2 ++ docs/libnm-glib/tmpl/nm-device-bond.sgml | 21 +++++++++++++++ docs/libnm-glib/version.xml | 2 +- 12 files changed, 117 insertions(+), 8 deletions(-) (limited to 'docs/libnm-glib') diff --git a/docs/libnm-glib/Makefile.in b/docs/libnm-glib/Makefile.in index 066e42e5..717cfbf0 100644 --- a/docs/libnm-glib/Makefile.in +++ b/docs/libnm-glib/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -21,6 +21,23 @@ # Everything below here is generic # #################################### VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -68,6 +85,11 @@ am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ SOURCES = DIST_SOURCES = +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ALL_LINGUAS = @ALL_LINGUAS@ diff --git a/docs/libnm-glib/html/NMDeviceAdsl.html b/docs/libnm-glib/html/NMDeviceAdsl.html index 3dae6d21..344031f5 100644 --- a/docs/libnm-glib/html/NMDeviceAdsl.html +++ b/docs/libnm-glib/html/NMDeviceAdsl.html @@ -212,7 +212,8 @@ Creates a new

Returns :

-a new device +a new device. [transfer full] + diff --git a/docs/libnm-glib/html/NMDeviceBond.html b/docs/libnm-glib/html/NMDeviceBond.html index 1cdc8e2a..9cb2c551 100644 --- a/docs/libnm-glib/html/NMDeviceBond.html +++ b/docs/libnm-glib/html/NMDeviceBond.html @@ -49,9 +49,11 @@ enum NM_DEVICE_BOND_CARRIER #define NM_DEVICE_BOND_ERROR #define NM_DEVICE_BOND_HW_ADDRESS +#define NM_DEVICE_BOND_SLAVES GQuark nm_device_bond_error_quark (void); gboolean nm_device_bond_get_carrier (NMDeviceBond *device); const char * nm_device_bond_get_hw_address (NMDeviceBond *device); +const GPtrArray * nm_device_bond_get_slaves (NMDeviceBond *device); GObject * nm_device_bond_new (DBusGConnection *connection, const char *path); @@ -76,6 +78,7 @@ NMDeviceBond implements 
   "carrier"                  gboolean              : Read
   "hw-address"               gchar*                : Read
+  "slaves"                   NMObjectArray*        : Read
@@ -171,6 +174,14 @@ NMDeviceBond implements
+

NM_DEVICE_BOND_SLAVES

+
#define NM_DEVICE_BOND_SLAVES      "slaves"
+
+

+

+
+
+

nm_device_bond_error_quark ()

GQuark              nm_device_bond_error_quark          (void);

@@ -232,6 +243,32 @@ device, and must not be modified.

+

nm_device_bond_get_slaves ()

+
const GPtrArray *   nm_device_bond_get_slaves           (NMDeviceBond *device);
+

+Gets the devices currently slaved to device. +

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

device :

a NMDeviceBond +

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] +
+

Since 0.9.6.4

+
+
+

nm_device_bond_new ()

GObject *           nm_device_bond_new                  (DBusGConnection *connection,
                                                          const char *path);
@@ -278,6 +315,14 @@ The hardware (MAC) address of the device.

Default value: NULL

+
+
+

The "slaves" property

+
  "slaves"                   NMObjectArray*        : Read
+

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

+
diff --git a/docs/libnm-glib/html/NMSecretAgent.html b/docs/libnm-glib/html/NMSecretAgent.html index d169f441..61a4048a 100644 --- a/docs/libnm-glib/html/NMSecretAgent.html +++ b/docs/libnm-glib/html/NMSecretAgent.html @@ -352,7 +352,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

@@ -383,7 +383,7 @@ something like this: NM_SETTING_WIRELESS_SECURITY_PSK, "my really cool PSK", NULL);nm_connection_add_setting (secrets, NM_SETTING (s_wsec)); -secrets_hash = nm_connection_to_hash (secrets); +secrets_hash = nm_connection_to_hash (secrets, NM_SETTING_HASH_FLAG_ALL);(call the NMSecretAgentGetSecretsFunc with secrets_hash) diff --git a/docs/libnm-glib/html/api-index-full.html b/docs/libnm-glib/html/api-index-full.html index 46239b5d..93e2532e 100644 --- a/docs/libnm-glib/html/api-index-full.html +++ b/docs/libnm-glib/html/api-index-full.html @@ -639,6 +639,10 @@
+NMDeviceBond:slaves, object property in NMDeviceBond +
+
+
NMDeviceBondClass, struct in NMDeviceBond
@@ -935,6 +939,10 @@
+nm_device_bond_get_slaves, function in NMDeviceBond +
+
+
NM_DEVICE_BOND_HW_ADDRESS, macro in NMDeviceBond
@@ -943,6 +951,10 @@
+NM_DEVICE_BOND_SLAVES, macro in NMDeviceBond +
+
+
NM_DEVICE_BT_CAPABILITIES, macro in NMDeviceBt
diff --git a/docs/libnm-glib/html/ch02.html b/docs/libnm-glib/html/ch02.html index a462e06f..fa143784 100644 --- a/docs/libnm-glib/html/ch02.html +++ b/docs/libnm-glib/html/ch02.html @@ -21,7 +21,7 @@

-libnm-glib API Reference

+libnm-glib API Reference
NMClient diff --git a/docs/libnm-glib/html/index.html b/docs/libnm-glib/html/index.html index 487d0ab2..a0375d4e 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.0 + for libnm-glib 0.9.6.4 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 diff --git a/docs/libnm-glib/html/index.sgml b/docs/libnm-glib/html/index.sgml index 14757e3b..cc8e3b43 100644 --- a/docs/libnm-glib/html/index.sgml +++ b/docs/libnm-glib/html/index.sgml @@ -409,13 +409,16 @@ + + + diff --git a/docs/libnm-glib/html/libnm-glib.devhelp2 b/docs/libnm-glib/html/libnm-glib.devhelp2 index 64e57d5f..7f2a66e7 100644 --- a/docs/libnm-glib/html/libnm-glib.devhelp2 +++ b/docs/libnm-glib/html/libnm-glib.devhelp2 @@ -310,12 +310,15 @@ + + + diff --git a/docs/libnm-glib/libnm-glib-sections.txt b/docs/libnm-glib/libnm-glib-sections.txt index ff603451..a150d0c0 100644 --- a/docs/libnm-glib/libnm-glib-sections.txt +++ b/docs/libnm-glib/libnm-glib-sections.txt @@ -221,9 +221,11 @@ NMDeviceBondError NM_DEVICE_BOND_CARRIER NM_DEVICE_BOND_ERROR NM_DEVICE_BOND_HW_ADDRESS +NM_DEVICE_BOND_SLAVES nm_device_bond_error_quark nm_device_bond_get_carrier nm_device_bond_get_hw_address +nm_device_bond_get_slaves nm_device_bond_new NM_DEVICE_BOND diff --git a/docs/libnm-glib/tmpl/nm-device-bond.sgml b/docs/libnm-glib/tmpl/nm-device-bond.sgml index 955a2df4..29c46c9a 100644 --- a/docs/libnm-glib/tmpl/nm-device-bond.sgml +++ b/docs/libnm-glib/tmpl/nm-device-bond.sgml @@ -38,6 +38,11 @@ NMDeviceBond + + + + + @@ -82,6 +87,13 @@ NMDeviceBond + + + + + + + @@ -109,6 +121,15 @@ NMDeviceBond @Returns: + + + + + +@device: +@Returns: + + diff --git a/docs/libnm-glib/version.xml b/docs/libnm-glib/version.xml index c318497f..f6c687fe 100644 --- a/docs/libnm-glib/version.xml +++ b/docs/libnm-glib/version.xml @@ -1 +1 @@ -0.9.6.0 +0.9.6.4 -- cgit 1.3.0-6-gf8a5