From 78c3b8801ecf4975e5da1af3b10ae20dd2d876de Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Wed, 20 Apr 2016 21:11:10 +0200 Subject: Imported Upstream version 1.2.0 --- docs/libnm/html/NMVpnEditorPlugin.html | 44 ++++++++++++++++++---------------- 1 file changed, 23 insertions(+), 21 deletions(-) (limited to 'docs/libnm/html/NMVpnEditorPlugin.html') diff --git a/docs/libnm/html/NMVpnEditorPlugin.html b/docs/libnm/html/NMVpnEditorPlugin.html index 13cc3db2..ad04d23d 100644 --- a/docs/libnm/html/NMVpnEditorPlugin.html +++ b/docs/libnm/html/NMVpnEditorPlugin.html @@ -77,7 +77,7 @@ -NMConnection * +NMConnection * nm_vpn_editor_plugin_import () @@ -226,7 +226,7 @@ nm_vpn_editor_plugin_factory (GEr

nm_vpn_editor_plugin_get_editor ()

NMVpnEditor *
 nm_vpn_editor_plugin_get_editor (NMVpnEditorPlugin *plugin,
-                                 NMConnection *connection,
+                                 NMConnection *connection,
                                  GError **error);

Parameters

@@ -244,7 +244,7 @@ nm_vpn_editor_plugin_get_editor (

connection

-

the NMConnection to be edited

+

the NMConnection to be edited

  @@ -270,7 +270,7 @@ nm_vpn_editor_plugin_get_capabilities (

nm_vpn_editor_plugin_import ()

-
NMConnection *
+
NMConnection *
 nm_vpn_editor_plugin_import (NMVpnEditorPlugin *plugin,
                              const char *path,
                              GError **error);

@@ -290,7 +290,7 @@ nm_vpn_editor_plugin_import (
path

-
full path to the file to attempt to read into a new NMConnection

+
full path to the file to attempt to read into a new NMConnection

  
 
 
@@ -303,7 +303,7 @@ nm_vpn_editor_plugin_import (
 
Returns

-
 a new NMConnection imported from path
+
 a new NMConnection imported from path
 , or NULL
 on error or if the file at path
 was not recognized by this plugin. 

@@ -316,7 +316,7 @@ was not recognized by this plugin. 

 
gboolean
 nm_vpn_editor_plugin_export (NMVpnEditorPlugin *plugin,
                              const char *path,
-                             NMConnection *connection,
+                             NMConnection *connection,
                              GError **error);
@@ -325,24 +325,29 @@ nm_vpn_editor_plugin_export (char * nm_vpn_editor_plugin_get_suggested_filename (NMVpnEditorPlugin *plugin, - NMConnection *connection); + NMConnection *connection);

nm_vpn_editor_plugin_load_from_file ()

NMVpnEditorPlugin *
-nm_vpn_editor_plugin_load_from_file (const char *plugin_filename,
+nm_vpn_editor_plugin_load_from_file (const char *plugin_name,
                                      const char *check_service,
                                      int check_owner,
                                      NMUtilsCheckFilePredicate check_file,
                                      gpointer user_data,
                                      GError **error);
-

Load the shared libary plugin_filename +

Load the shared libary plugin_name and create a new NMVpnEditorPlugin instace via the NMVpnEditorPluginFactory function.

+

If plugin_name + is not an absolute path name, it assumes the file +is in the plugin directory of NetworkManager. In any case, the call +will do certain checks on the file before passing it to dlopen. +A consequence for that is, that you cannot omit the ".so" suffix.

-

Parameters

+

Parameters

@@ -351,14 +356,11 @@ function.

- - + + @@ -396,7 +398,7 @@ loading the shared library.

plugin_filename

The path to the share library to load. -Apply some common heuristics to find the library, such as -appending "so" file ending. -If the path is not an absolute path or no matching module -can be found, lookup inside a directory defined at compile time. -Due to this, check_file -might be called for two different paths.

plugin_name

The path or name of the shared library to load. +The path must either be an absolute filename to an existing file. +Alternatively, it can be the name (without path) of a library in the +plugin directory of NetworkManager.

  
-

Returns

+

Returns

a new plugin instance or NULL on error.

[transfer full]

@@ -520,7 +522,7 @@ if non-NULL.

import_from_file ()

Try to import a connection from the specified path. On -success, return a partial NMConnection object. On error, return NULL and +success, return a partial NMConnection object. On error, return NULL and set error with additional information. Note that error can be NULL, in -- cgit 1.3.0-6-gf8a5