From 485d149fe80915d94ed49ea6c2c0552cf7a3e79a Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Fri, 28 Oct 2011 23:04:16 +0200 Subject: Imported Upstream version 0.9.1.95 --- docs/libnm-glib/Makefile.am | 2 +- docs/libnm-glib/Makefile.in | 10 +++++++- docs/libnm-glib/html/NMDevice.html | 5 ++-- docs/libnm-glib/html/NMRemoteConnection.html | 12 ++++++---- docs/libnm-glib/html/NMRemoteSettings.html | 7 +++--- docs/libnm-glib/html/NMSecretAgent.html | 36 ++++++++++++++-------------- docs/libnm-glib/html/ch02.html | 2 +- docs/libnm-glib/html/index.html | 2 +- 8 files changed, 44 insertions(+), 32 deletions(-) (limited to 'docs/libnm-glib') diff --git a/docs/libnm-glib/Makefile.am b/docs/libnm-glib/Makefile.am index 7dfea79a..dcca994b 100644 --- a/docs/libnm-glib/Makefile.am +++ b/docs/libnm-glib/Makefile.am @@ -64,7 +64,7 @@ HTML_IMAGES = libnm-glib.png content_files = # Other files to distribute. -extra_files = +extra_files = libnm-glib.png # CFLAGS and LDFLAGS for compiling scan program. Only needed diff --git a/docs/libnm-glib/Makefile.in b/docs/libnm-glib/Makefile.in index 775d33be..7ebf62ad 100644 --- a/docs/libnm-glib/Makefile.in +++ b/docs/libnm-glib/Makefile.in @@ -159,8 +159,16 @@ LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@ LIBICONV = @LIBICONV@ LIBINTL = @LIBINTL@ LIBM = @LIBM@ +LIBNL1_CFLAGS = @LIBNL1_CFLAGS@ +LIBNL1_LIBS = @LIBNL1_LIBS@ +LIBNL2_CFLAGS = @LIBNL2_CFLAGS@ +LIBNL2_LIBS = @LIBNL2_LIBS@ +LIBNL3_CFLAGS = @LIBNL3_CFLAGS@ +LIBNL3_LIBS = @LIBNL3_LIBS@ LIBNL_CFLAGS = @LIBNL_CFLAGS@ LIBNL_LIBS = @LIBNL_LIBS@ +LIBNL_ROUTE3_CFLAGS = @LIBNL_ROUTE3_CFLAGS@ +LIBNL_ROUTE3_LIBS = @LIBNL_ROUTE3_LIBS@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ @@ -341,7 +349,7 @@ HTML_IMAGES = libnm-glib.png content_files = # Other files to distribute. -extra_files = +extra_files = libnm-glib.png # CFLAGS and LDFLAGS for compiling scan program. Only needed # if $(DOC_MODULE).types is non-empty. diff --git a/docs/libnm-glib/html/NMDevice.html b/docs/libnm-glib/html/NMDevice.html index 2b01b135..94866102 100644 --- a/docs/libnm-glib/html/NMDevice.html +++ b/docs/libnm-glib/html/NMDevice.html @@ -729,12 +729,13 @@ request.

callback :

-callback to be called when disconnect operation completes. [scope async] +callback to be called when disconnect +operation completes. [scope async][allow-none]

user_data :

-caller-specific data passed to callback +caller-specific data passed to callback. [closure] diff --git a/docs/libnm-glib/html/NMRemoteConnection.html b/docs/libnm-glib/html/NMRemoteConnection.html index 87aaf32b..bbdd59fd 100644 --- a/docs/libnm-glib/html/NMRemoteConnection.html +++ b/docs/libnm-glib/html/NMRemoteConnection.html @@ -221,12 +221,13 @@ save them in the settings service.

callback :

-a function to be called when the commit completes. [scope async] +a function to be called when the +commit completes. [scope async][allow none]

user_data :

-caller-specific data to be passed to callback +caller-specific data to be passed to callback. [closure] @@ -256,7 +257,7 @@ Delete the connection.

user_data :

-caller-specific data to be passed to callback +caller-specific data to be passed to callback. [closure] @@ -286,12 +287,13 @@ Request the connection's secrets.

callback :

-a function to be called when the update completes. [scope async] +a function to be called when the update completes; +must not be NULL. [scope async]

user_data :

-caller-specific data to be passed to callback +caller-specific data to be passed to callback. [closure] diff --git a/docs/libnm-glib/html/NMRemoteSettings.html b/docs/libnm-glib/html/NMRemoteSettings.html index 0457a567..09f803ff 100644 --- a/docs/libnm-glib/html/NMRemoteSettings.html +++ b/docs/libnm-glib/html/NMRemoteSettings.html @@ -421,7 +421,7 @@ added, not the object itself

user_data :

-caller-specific data passed to callback +caller-specific data passed to callback. [closure] @@ -457,12 +457,13 @@ persistent hostname

callback :

-callback to be called when the hostname operation completes. [scope async] +callback to be called when the +hostname operation completes. [scope async][allow none]

user_data :

-caller-specific data passed to callback +caller-specific data passed to callback. [closure] diff --git a/docs/libnm-glib/html/NMSecretAgent.html b/docs/libnm-glib/html/NMSecretAgent.html index 4b08499c..ff6be0da 100644 --- a/docs/libnm-glib/html/NMSecretAgent.html +++ b/docs/libnm-glib/html/NMSecretAgent.html @@ -75,15 +75,15 @@ enum const char **hints, NMSecretAgentGetSecretsFlags flags, NMSecretAgentGetSecretsFunc callback, - gpointer callback_data); + gpointer user_data); void nm_secret_agent_save_secrets (NMSecretAgent *self, NMConnection *connection, NMSecretAgentSaveSecretsFunc callback, - gpointer callback_data); + gpointer user_data); void nm_secret_agent_delete_secrets (NMSecretAgent *self, NMConnection *connection, NMSecretAgentDeleteSecretsFunc callback, - gpointer callback_data); + gpointer user_data);
@@ -263,7 +263,7 @@ is allowed. /* Called when the subclass should retrieve and return secrets. Subclass * must copy or reference any arguments it may require after returning from * this method, as the arguments will freed (except for 'agent', 'callback', - * and 'callback_data' of course). If the request is canceled, the callback + * and 'user_data' of course). If the request is canceled, the callback * should still be called, but with the NM_SECRET_AGENT_ERROR_AGENT_CANCELED * error. */ @@ -274,7 +274,7 @@ is allowed. const char **hints, NMSecretAgentGetSecretsFlags flags, NMSecretAgentGetSecretsFunc callback, - gpointer callback_data); + gpointer user_data); /* Called when the subclass should cancel an outstanding request to * get secrets for a given connection. Canceling the request MUST @@ -289,26 +289,26 @@ is allowed. /* Called when the subclass should save the secrets contained in the * connection to backing storage. Subclass must copy or reference any * arguments it may require after returning from this method, as the - * arguments will freed (except for 'agent', 'callback', and 'callback_data' + * arguments will freed (except for 'agent', 'callback', and 'user_data' * of course). */ void (*save_secrets) (NMSecretAgent *agent, NMConnection *connection, const char *connection_path, NMSecretAgentSaveSecretsFunc callback, - gpointer callback_data); + gpointer user_data); /* Called when the subclass should delete the secrets contained in the * connection from backing storage. Subclass must copy or reference any * arguments it may require after returning from this method, as the - * arguments will freed (except for 'agent', 'callback', and 'callback_data' + * arguments will freed (except for 'agent', 'callback', and 'user_data' * of course). */ void (*delete_secrets) (NMSecretAgent *agent, NMConnection *connection, const char *connection_path, NMSecretAgentDeleteSecretsFunc callback, - gpointer callback_data); + gpointer user_data); /* Signals */ void (*registration_result) (NMSecretAgent *agent, GError *error); @@ -393,7 +393,7 @@ store secrets on behalf of this user. const char **hints, NMSecretAgentGetSecretsFlags flags, NMSecretAgentGetSecretsFunc callback, - gpointer callback_data); + gpointer user_data);

Asyncronously retrieve secrets belonging to connection for the setting setting_name. flags indicate specific behavior that the secret @@ -435,8 +435,8 @@ VFunc: get_secrets -

callback_data :

-. [closure] +

user_data :

+caller-specific data to be passed to callback. [closure] @@ -448,7 +448,7 @@ VFunc: get_secrets 
void                nm_secret_agent_save_secrets        (NMSecretAgent *self,
                                                          NMConnection *connection,
                                                          NMSecretAgentSaveSecretsFunc callback,
-                                                         gpointer callback_data);
+ gpointer user_data);

Asyncronously ensure that all secrets inside connection are stored to disk. @@ -475,8 +475,8 @@ VFunc: save_secrets -

callback_data :

-. [closure] +

user_data :

+caller-specific data to be passed to callback. [closure] @@ -488,7 +488,7 @@ VFunc: save_secrets 
void                nm_secret_agent_delete_secrets      (NMSecretAgent *self,
                                                          NMConnection *connection,
                                                          NMSecretAgentDeleteSecretsFunc callback,
-                                                         gpointer callback_data);
+ gpointer user_data);

Asynchronously ask the agent to delete all saved secrets belonging to connection. @@ -515,8 +515,8 @@ VFunc: delete_secrets -

callback_data :

-. [closure] +

user_data :

+caller-specific data to be passed to callback. [closure] diff --git a/docs/libnm-glib/html/ch02.html b/docs/libnm-glib/html/ch02.html index 4aa9ceee..5ed579ad 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 10f59ff8..c64038ed 100644 --- a/docs/libnm-glib/html/index.html +++ b/docs/libnm-glib/html/index.html @@ -29,7 +29,7 @@

Copyright © 2011 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 -- cgit 1.3.0-6-gf8a5