Imported Upstream version 0.8.3.998 upstream/0.8.3.998

1 files changed, 48 insertions, 52 deletions

diff --git a/docs/libnm-glib/html/libnm-glib-NMSettings.html b/docs/libnm-glib/html/libnm-glib-NMSettings.html
index 77b1e594..e56ab8fc 100644
--- a/docs/libnm-glib/html/libnm-glib-NMSettings.html
+++ b/docs/libnm-glib/html/libnm-glib-NMSettings.html
@@ -2,11 +2,11 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>nm-settings-interface</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.76.0">
+<title>NMSettings</title>
+<meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
 <link rel="home" href="index.html" title="libnm-glib Reference Manual">
 <link rel="up" href="ch01.html" title="libnm-glib Objects">
-<link rel="prev" href="libnm-glib-NMSettingsConnection.html" title="nm-settings-connection-interface">
+<link rel="prev" href="libnm-glib-NMSettingsConnection.html" title="NMSettingsConnection">
 <link rel="next" href="libnm-glib-NMSettingsService.html" title="NMSettingsService">
 <meta name="generator" content="GTK-Doc V1.15 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
@@ -24,42 +24,67 @@
 <a href="#libnm-glib-NMSettings.synopsis" class="shortcut">Top</a>
                    | 
                   <a href="#libnm-glib-NMSettings.description" class="shortcut">Description</a>
+                   | 
+                  <a href="#libnm-glib-NMSettings.object-hierarchy" class="shortcut">Object Hierarchy</a>
+                   | 
+                  <a href="#libnm-glib-NMSettings.prerequisites" class="shortcut">Prerequisites</a>
+                   | 
+                  <a href="#libnm-glib-NMSettings.implementations" class="shortcut">Known Implementations</a>
 </td></tr>
 </table>
-<div class="refentry" title="nm-settings-interface">
+<div class="refentry" title="NMSettings">
 <a name="libnm-glib-NMSettings"></a><div class="titlepage"></div>
 <div class="refnamediv"><table width="100%"><tr>
 <td valign="top">
-<h2><span class="refentrytitle"><a name="libnm-glib-NMSettings.top_of_page"></a>nm-settings-interface</span></h2>
-<p>nm-settings-interface</p>
+<h2><span class="refentrytitle"><a name="libnm-glib-NMSettings.top_of_page"></a>NMSettings</span></h2>
+<p>NMSettings</p>
 </td>
 <td valign="top" align="right"></td>
 </tr></table></div>
 <div class="refsynopsisdiv" title="Synopsis">
 <a name="libnm-glib-NMSettings.synopsis"></a><h2>Synopsis</h2>
-<pre class="synopsis">enum                <a class="link" href="libnm-glib-NMSettings.html#NMSettingsInterfaceError" title="enum NMSettingsInterfaceError">NMSettingsInterfaceError</a>;
+<a name="NMSettingsInterface"></a><pre class="synopsis">enum                <a class="link" href="libnm-glib-NMSettings.html#NMSettingsInterfaceError" title="enum NMSettingsInterfaceError">NMSettingsInterfaceError</a>;
 #define             <a class="link" href="libnm-glib-NMSettings.html#NM-SETTINGS-INTERFACE-ERROR:CAPS" title="NM_SETTINGS_INTERFACE_ERROR">NM_SETTINGS_INTERFACE_ERROR</a>
 <a href="http://library.gnome.org/devel/glib/unstable/glib-Quarks.html#GQuark"><span class="returnvalue">GQuark</span></a>              <a class="link" href="libnm-glib-NMSettings.html#nm-settings-interface-error-quark" title="nm_settings_interface_error_quark ()">nm_settings_interface_error_quark</a>   (<em class="parameter"><code><span class="type">void</span></code></em>);
 #define             <a class="link" href="libnm-glib-NMSettings.html#NM-TYPE-SETTINGS-INTERFACE-ERROR:CAPS" title="NM_TYPE_SETTINGS_INTERFACE_ERROR">NM_TYPE_SETTINGS_INTERFACE_ERROR</a>
 #define             <a class="link" href="libnm-glib-NMSettings.html#NM-SETTINGS-INTERFACE-NEW-CONNECTION:CAPS" title="NM_SETTINGS_INTERFACE_NEW_CONNECTION">NM_SETTINGS_INTERFACE_NEW_CONNECTION</a>
 #define             <a class="link" href="libnm-glib-NMSettings.html#NM-SETTINGS-INTERFACE-CONNECTIONS-READ:CAPS" title="NM_SETTINGS_INTERFACE_CONNECTIONS_READ">NM_SETTINGS_INTERFACE_CONNECTIONS_READ</a>
-                    <a class="link" href="libnm-glib-NMSettings.html#NMSettingsInterface" title="NMSettingsInterface">NMSettingsInterface</a>;
-<span class="returnvalue">void</span>                (<a class="link" href="libnm-glib-NMSettings.html#NMSettingsAddConnectionFunc" title="NMSettingsAddConnectionFunc ()">*NMSettingsAddConnectionFunc</a>)      (<em class="parameter"><code><a class="link" href="libnm-glib-NMSettings.html#NMSettingsInterface" title="NMSettingsInterface"><span class="type">NMSettingsInterface</span></a> *settings</code></em>,
+                    <a class="link" href="libnm-glib-NMSettings.html#NMSettingsInterface-struct" title="NMSettingsInterface">NMSettingsInterface</a>;
+<span class="returnvalue">void</span>                (<a class="link" href="libnm-glib-NMSettings.html#NMSettingsAddConnectionFunc" title="NMSettingsAddConnectionFunc ()">*NMSettingsAddConnectionFunc</a>)      (<em class="parameter"><code><a class="link" href="libnm-glib-NMSettings.html#NMSettingsInterface"><span class="type">NMSettingsInterface</span></a> *settings</code></em>,
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> *error</code></em>,
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> user_data</code></em>);
 <a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="returnvalue">GType</span></a>               <a class="link" href="libnm-glib-NMSettings.html#nm-settings-interface-get-type" title="nm_settings_interface_get_type ()">nm_settings_interface_get_type</a>      (<em class="parameter"><code><span class="type">void</span></code></em>);
 <a href="http://library.gnome.org/devel/glib/unstable/glib-Singly-Linked-Lists.html#GSList"><span class="returnvalue">GSList</span></a> *            <a class="link" href="libnm-glib-NMSettings.html#nm-settings-interface-list-connections" title="nm_settings_interface_list_connections ()">nm_settings_interface_list_connections</a>
-                                                        (<em class="parameter"><code><a class="link" href="libnm-glib-NMSettings.html#NMSettingsInterface" title="NMSettingsInterface"><span class="type">NMSettingsInterface</span></a> *settings</code></em>);
-<a class="link" href="libnm-glib-NMSettingsConnection.html#NMSettingsConnectionInterface" title="NMSettingsConnectionInterface"><span class="returnvalue">NMSettingsConnectionInterface</span></a> * <a class="link" href="libnm-glib-NMSettings.html#nm-settings-interface-get-connection-by-path" title="nm_settings_interface_get_connection_by_path ()">nm_settings_interface_get_connection_by_path</a>
-                                                        (<em class="parameter"><code><a class="link" href="libnm-glib-NMSettings.html#NMSettingsInterface" title="NMSettingsInterface"><span class="type">NMSettingsInterface</span></a> *settings</code></em>,
+                                                        (<em class="parameter"><code><a class="link" href="libnm-glib-NMSettings.html#NMSettingsInterface"><span class="type">NMSettingsInterface</span></a> *settings</code></em>);
+<a class="link" href="libnm-glib-NMSettingsConnection.html#NMSettingsConnectionInterface"><span class="returnvalue">NMSettingsConnectionInterface</span></a> * <a class="link" href="libnm-glib-NMSettings.html#nm-settings-interface-get-connection-by-path" title="nm_settings_interface_get_connection_by_path ()">nm_settings_interface_get_connection_by_path</a>
+                                                        (<em class="parameter"><code><a class="link" href="libnm-glib-NMSettings.html#NMSettingsInterface"><span class="type">NMSettingsInterface</span></a> *settings</code></em>,
                                                          <em class="parameter"><code>const <span class="type">char</span> *path</code></em>);
 <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            <a class="link" href="libnm-glib-NMSettings.html#nm-settings-interface-add-connection" title="nm_settings_interface_add_connection ()">nm_settings_interface_add_connection</a>
-                                                        (<em class="parameter"><code><a class="link" href="libnm-glib-NMSettings.html#NMSettingsInterface" title="NMSettingsInterface"><span class="type">NMSettingsInterface</span></a> *settings</code></em>,
-                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>,
+                                                        (<em class="parameter"><code><a class="link" href="libnm-glib-NMSettings.html#NMSettingsInterface"><span class="type">NMSettingsInterface</span></a> *settings</code></em>,
+                                                         <em class="parameter"><code><a href="http://projects.gnome.org/NetworkManager/developers/libnm-util/08/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>,
                                                          <em class="parameter"><code><a class="link" href="libnm-glib-NMSettings.html#NMSettingsAddConnectionFunc" title="NMSettingsAddConnectionFunc ()"><span class="type">NMSettingsAddConnectionFunc</span></a> callback</code></em>,
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> user_data</code></em>);
 </pre>
 </div>
+<div class="refsect1" title="Object Hierarchy">
+<a name="libnm-glib-NMSettings.object-hierarchy"></a><h2>Object Hierarchy</h2>
+<pre class="synopsis">
+  GInterface
+   +----NMSettingsInterface
+</pre>
+</div>
+<div class="refsect1" title="Prerequisites">
+<a name="libnm-glib-NMSettings.prerequisites"></a><h2>Prerequisites</h2>
+<p>
+NMSettingsInterface requires
+ <a href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GObject">GObject</a>.</p>
+</div>
+<div class="refsect1" title="Known Implementations">
+<a name="libnm-glib-NMSettings.implementations"></a><h2>Known Implementations</h2>
+<p>
+NMSettingsInterface is implemented by
+ <a class="link" href="NMRemoteSettings.html" title="NMRemoteSettings">NMRemoteSettings</a>.</p>
+</div>
 <div class="refsect1" title="Description">
 <a name="libnm-glib-NMSettings.description"></a><h2>Description</h2>
 <p>
@@ -132,44 +157,15 @@ Setting error quark.
 </div>
 <hr>
 <div class="refsect2" title="NMSettingsInterface">
-<a name="NMSettingsInterface"></a><h3>NMSettingsInterface</h3>
-<pre class="programlisting">typedef struct {
-	GTypeInterface g_iface;
-
-	/* Methods */
-	/* Returns a list of objects implementing NMSettingsConnectionInterface */
-	GSList * (*list_connections) (NMSettingsInterface *settings);
-
-	NMSettingsConnectionInterface * (*get_connection_by_path) (NMSettingsInterface *settings,
-	                                                           const char *path);
-
-	gboolean (*add_connection) (NMSettingsInterface *settings,
-	                            NMConnection *connection,
-	                            NMSettingsAddConnectionFunc callback,
-	                            gpointer user_data);
-
-	/* Signals */
-	void (*new_connection) (NMSettingsInterface *settings,
-	                        NMSettingsConnectionInterface *connection);
-
-	void (*connections_read) (NMSettingsInterface *settings);
-
-	/* Padding for future expansion */
-	void (*_reserved1) (void);
-	void (*_reserved2) (void);
-	void (*_reserved3) (void);
-	void (*_reserved4) (void);
-	void (*_reserved5) (void);
-	void (*_reserved6) (void);
-} NMSettingsInterface;
-</pre>
+<a name="NMSettingsInterface-struct"></a><h3>NMSettingsInterface</h3>
+<pre class="programlisting">typedef struct _NMSettingsInterface NMSettingsInterface;</pre>
 <p>
 </p>
 </div>
 <hr>
 <div class="refsect2" title="NMSettingsAddConnectionFunc ()">
 <a name="NMSettingsAddConnectionFunc"></a><h3>NMSettingsAddConnectionFunc ()</h3>
-<pre class="programlisting"><span class="returnvalue">void</span>                (*NMSettingsAddConnectionFunc)      (<em class="parameter"><code><a class="link" href="libnm-glib-NMSettings.html#NMSettingsInterface" title="NMSettingsInterface"><span class="type">NMSettingsInterface</span></a> *settings</code></em>,
+<pre class="programlisting"><span class="returnvalue">void</span>                (*NMSettingsAddConnectionFunc)      (<em class="parameter"><code><a class="link" href="libnm-glib-NMSettings.html#NMSettingsInterface"><span class="type">NMSettingsInterface</span></a> *settings</code></em>,
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> *error</code></em>,
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> user_data</code></em>);</pre>
 <p>
@@ -214,7 +210,7 @@ Setting error quark.
 <div class="refsect2" title="nm_settings_interface_list_connections ()">
 <a name="nm-settings-interface-list-connections"></a><h3>nm_settings_interface_list_connections ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Singly-Linked-Lists.html#GSList"><span class="returnvalue">GSList</span></a> *            nm_settings_interface_list_connections
-                                                        (<em class="parameter"><code><a class="link" href="libnm-glib-NMSettings.html#NMSettingsInterface" title="NMSettingsInterface"><span class="type">NMSettingsInterface</span></a> *settings</code></em>);</pre>
+                                                        (<em class="parameter"><code><a class="link" href="libnm-glib-NMSettings.html#NMSettingsInterface"><span class="type">NMSettingsInterface</span></a> *settings</code></em>);</pre>
 <p>
 </p>
 <div class="variablelist"><table border="0">
@@ -236,8 +232,8 @@ Setting error quark.
 <hr>
 <div class="refsect2" title="nm_settings_interface_get_connection_by_path ()">
 <a name="nm-settings-interface-get-connection-by-path"></a><h3>nm_settings_interface_get_connection_by_path ()</h3>
-<pre class="programlisting"><a class="link" href="libnm-glib-NMSettingsConnection.html#NMSettingsConnectionInterface" title="NMSettingsConnectionInterface"><span class="returnvalue">NMSettingsConnectionInterface</span></a> * nm_settings_interface_get_connection_by_path
-                                                        (<em class="parameter"><code><a class="link" href="libnm-glib-NMSettings.html#NMSettingsInterface" title="NMSettingsInterface"><span class="type">NMSettingsInterface</span></a> *settings</code></em>,
+<pre class="programlisting"><a class="link" href="libnm-glib-NMSettingsConnection.html#NMSettingsConnectionInterface"><span class="returnvalue">NMSettingsConnectionInterface</span></a> * nm_settings_interface_get_connection_by_path
+                                                        (<em class="parameter"><code><a class="link" href="libnm-glib-NMSettings.html#NMSettingsInterface"><span class="type">NMSettingsInterface</span></a> *settings</code></em>,
                                                          <em class="parameter"><code>const <span class="type">char</span> *path</code></em>);</pre>
 <p>
 </p>
@@ -266,8 +262,8 @@ Setting error quark.
 <div class="refsect2" title="nm_settings_interface_add_connection ()">
 <a name="nm-settings-interface-add-connection"></a><h3>nm_settings_interface_add_connection ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            nm_settings_interface_add_connection
-                                                        (<em class="parameter"><code><a class="link" href="libnm-glib-NMSettings.html#NMSettingsInterface" title="NMSettingsInterface"><span class="type">NMSettingsInterface</span></a> *settings</code></em>,
-                                                         <em class="parameter"><code><a href="/usr/share/gtk-doc/html/libnm-util/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>,
+                                                        (<em class="parameter"><code><a class="link" href="libnm-glib-NMSettings.html#NMSettingsInterface"><span class="type">NMSettingsInterface</span></a> *settings</code></em>,
+                                                         <em class="parameter"><code><a href="http://projects.gnome.org/NetworkManager/developers/libnm-util/08/NMConnection.html"><span class="type">NMConnection</span></a> *connection</code></em>,
                                                          <em class="parameter"><code><a class="link" href="libnm-glib-NMSettings.html#NMSettingsAddConnectionFunc" title="NMSettingsAddConnectionFunc ()"><span class="type">NMSettingsAddConnectionFunc</span></a> callback</code></em>,
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> user_data</code></em>);</pre>
 <p>
@@ -278,7 +274,7 @@ Requests that the settings service add the given settings to a new connection.
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>settings</code></em> :</span></p></td>
-<td>a object implementing <a class="link" href="libnm-glib-NMSettings.html#NMSettingsInterface" title="NMSettingsInterface"><code class="literal">NMSettingsInterface</code></a>
+<td>a object implementing <a class="link" href="libnm-glib-NMSettings.html#NMSettingsInterface"><code class="literal">NMSettingsInterface</code></a>
 </td>
 </tr>
 <tr>