diff options
Diffstat (limited to 'docs/libnm-glib/tmpl')
30 files changed, 1235 insertions, 1187 deletions
diff --git a/docs/libnm-glib/tmpl/libnm_glib.sgml b/docs/libnm-glib/tmpl/libnm_glib.sgml deleted file mode 100644 index ed0710b9..00000000 --- a/docs/libnm-glib/tmpl/libnm_glib.sgml +++ /dev/null @@ -1,24 +0,0 @@ -<!-- ##### SECTION Title ##### --> -libnm_glib - -<!-- ##### SECTION Short_Description ##### --> - - -<!-- ##### SECTION Long_Description ##### --> -<para> - -</para> - - -<!-- ##### SECTION See_Also ##### --> -<para> - -</para> - - -<!-- ##### SECTION Stability_Level ##### --> - - -<!-- ##### SECTION Image ##### --> - - diff --git a/docs/libnm-glib/tmpl/nm-access-point.sgml b/docs/libnm-glib/tmpl/nm-access-point.sgml index 41cade52..ad78146c 100644 --- a/docs/libnm-glib/tmpl/nm-access-point.sgml +++ b/docs/libnm-glib/tmpl/nm-access-point.sgml @@ -22,166 +22,165 @@ NMAccessPoint <!-- ##### SECTION Image ##### --> -<!-- ##### STRUCT NMAccessPoint ##### --> +<!-- ##### MACRO NM_ACCESS_POINT_FLAGS ##### --> <para> </para> -<!-- ##### ARG NMAccessPoint:bssid ##### --> + +<!-- ##### MACRO NM_ACCESS_POINT_WPA_FLAGS ##### --> <para> </para> -<!-- ##### ARG NMAccessPoint:flags ##### --> -<para> -</para> -<!-- ##### ARG NMAccessPoint:frequency ##### --> +<!-- ##### MACRO NM_ACCESS_POINT_RSN_FLAGS ##### --> <para> </para> -<!-- ##### ARG NMAccessPoint:hw-address ##### --> -<para> -</para> -<!-- ##### ARG NMAccessPoint:max-bitrate ##### --> +<!-- ##### MACRO NM_ACCESS_POINT_SSID ##### --> <para> </para> -<!-- ##### ARG NMAccessPoint:mode ##### --> -<para> -</para> -<!-- ##### ARG NMAccessPoint:rsn-flags ##### --> +<!-- ##### MACRO NM_ACCESS_POINT_BSSID ##### --> <para> </para> -<!-- ##### ARG NMAccessPoint:ssid ##### --> -<para> -</para> -<!-- ##### ARG NMAccessPoint:strength ##### --> +<!-- ##### MACRO NM_ACCESS_POINT_FREQUENCY ##### --> <para> </para> -<!-- ##### ARG NMAccessPoint:wpa-flags ##### --> -<para> -</para> -<!-- ##### STRUCT NMAccessPointClass ##### --> +<!-- ##### MACRO NM_ACCESS_POINT_MODE ##### --> <para> </para> -@parent: -@_reserved1: -@_reserved2: -@_reserved3: -@_reserved4: -@_reserved5: -@_reserved6: -<!-- ##### MACRO NM_ACCESS_POINT_BSSID ##### --> + +<!-- ##### MACRO NM_ACCESS_POINT_MAX_BITRATE ##### --> <para> </para> -<!-- ##### MACRO NM_ACCESS_POINT_FLAGS ##### --> +<!-- ##### MACRO NM_ACCESS_POINT_STRENGTH ##### --> <para> </para> -<!-- ##### MACRO NM_ACCESS_POINT_FREQUENCY ##### --> +<!-- ##### MACRO NM_ACCESS_POINT_HW_ADDRESS ##### --> <para> </para> -<!-- ##### MACRO NM_ACCESS_POINT_HW_ADDRESS ##### --> +<!-- ##### STRUCT NMAccessPoint ##### --> <para> </para> - -<!-- ##### MACRO NM_ACCESS_POINT_MAX_BITRATE ##### --> +<!-- ##### ARG NMAccessPoint:bssid ##### --> <para> </para> +<!-- ##### ARG NMAccessPoint:flags ##### --> +<para> +</para> -<!-- ##### MACRO NM_ACCESS_POINT_MODE ##### --> +<!-- ##### ARG NMAccessPoint:frequency ##### --> <para> </para> +<!-- ##### ARG NMAccessPoint:hw-address ##### --> +<para> +</para> -<!-- ##### MACRO NM_ACCESS_POINT_RSN_FLAGS ##### --> +<!-- ##### ARG NMAccessPoint:max-bitrate ##### --> <para> </para> +<!-- ##### ARG NMAccessPoint:mode ##### --> +<para> +</para> -<!-- ##### MACRO NM_ACCESS_POINT_SSID ##### --> +<!-- ##### ARG NMAccessPoint:rsn-flags ##### --> <para> </para> +<!-- ##### ARG NMAccessPoint:ssid ##### --> +<para> +</para> -<!-- ##### MACRO NM_ACCESS_POINT_STRENGTH ##### --> +<!-- ##### ARG NMAccessPoint:strength ##### --> <para> </para> +<!-- ##### ARG NMAccessPoint:wpa-flags ##### --> +<para> +</para> -<!-- ##### MACRO NM_ACCESS_POINT_WPA_FLAGS ##### --> +<!-- ##### STRUCT NMAccessPointClass ##### --> <para> </para> +@parent: +@_reserved1: +@_reserved2: +@_reserved3: +@_reserved4: +@_reserved5: +@_reserved6: - -<!-- ##### FUNCTION nm_access_point_connection_valid ##### --> +<!-- ##### FUNCTION nm_access_point_new ##### --> <para> </para> -@ap: @connection: +@path: @Returns: -<!-- ##### FUNCTION nm_access_point_filter_connections ##### --> +<!-- ##### FUNCTION nm_access_point_get_flags ##### --> <para> </para> @ap: -@connections: @Returns: -<!-- ##### FUNCTION nm_access_point_get_bssid ##### --> +<!-- ##### FUNCTION nm_access_point_get_wpa_flags ##### --> <para> </para> @@ -190,7 +189,7 @@ NMAccessPoint @Returns: -<!-- ##### FUNCTION nm_access_point_get_flags ##### --> +<!-- ##### FUNCTION nm_access_point_get_rsn_flags ##### --> <para> </para> @@ -199,7 +198,7 @@ NMAccessPoint @Returns: -<!-- ##### FUNCTION nm_access_point_get_frequency ##### --> +<!-- ##### FUNCTION nm_access_point_get_ssid ##### --> <para> </para> @@ -208,7 +207,7 @@ NMAccessPoint @Returns: -<!-- ##### FUNCTION nm_access_point_get_hw_address ##### --> +<!-- ##### FUNCTION nm_access_point_get_bssid ##### --> <para> </para> @@ -217,7 +216,7 @@ NMAccessPoint @Returns: -<!-- ##### FUNCTION nm_access_point_get_max_bitrate ##### --> +<!-- ##### FUNCTION nm_access_point_get_frequency ##### --> <para> </para> @@ -235,7 +234,7 @@ NMAccessPoint @Returns: -<!-- ##### FUNCTION nm_access_point_get_rsn_flags ##### --> +<!-- ##### FUNCTION nm_access_point_get_max_bitrate ##### --> <para> </para> @@ -244,7 +243,7 @@ NMAccessPoint @Returns: -<!-- ##### FUNCTION nm_access_point_get_ssid ##### --> +<!-- ##### FUNCTION nm_access_point_get_strength ##### --> <para> </para> @@ -253,31 +252,32 @@ NMAccessPoint @Returns: -<!-- ##### FUNCTION nm_access_point_get_strength ##### --> +<!-- ##### FUNCTION nm_access_point_filter_connections ##### --> <para> </para> @ap: +@connections: @Returns: -<!-- ##### FUNCTION nm_access_point_get_wpa_flags ##### --> +<!-- ##### FUNCTION nm_access_point_connection_valid ##### --> <para> </para> @ap: +@connection: @Returns: -<!-- ##### FUNCTION nm_access_point_new ##### --> +<!-- ##### FUNCTION nm_access_point_get_hw_address ##### --> <para> </para> -@connection: -@path: +@ap: @Returns: diff --git a/docs/libnm-glib/tmpl/nm-active-connection.sgml b/docs/libnm-glib/tmpl/nm-active-connection.sgml index 40528ae9..56f51c6e 100644 --- a/docs/libnm-glib/tmpl/nm-active-connection.sgml +++ b/docs/libnm-glib/tmpl/nm-active-connection.sgml @@ -22,131 +22,132 @@ NMActiveConnection <!-- ##### SECTION Image ##### --> -<!-- ##### STRUCT NMActiveConnection ##### --> +<!-- ##### MACRO NM_ACTIVE_CONNECTION_CONNECTION ##### --> <para> </para> -<!-- ##### ARG NMActiveConnection:connection ##### --> + +<!-- ##### MACRO NM_ACTIVE_CONNECTION_UUID ##### --> <para> </para> -<!-- ##### ARG NMActiveConnection:default ##### --> -<para> -</para> -<!-- ##### ARG NMActiveConnection:default6 ##### --> +<!-- ##### MACRO NM_ACTIVE_CONNECTION_SPECIFIC_OBJECT ##### --> <para> </para> -<!-- ##### ARG NMActiveConnection:devices ##### --> -<para> -</para> -<!-- ##### ARG NMActiveConnection:master ##### --> +<!-- ##### MACRO NM_ACTIVE_CONNECTION_DEVICES ##### --> <para> </para> -<!-- ##### ARG NMActiveConnection:specific-object ##### --> -<para> -</para> -<!-- ##### ARG NMActiveConnection:state ##### --> +<!-- ##### MACRO NM_ACTIVE_CONNECTION_STATE ##### --> <para> </para> -<!-- ##### ARG NMActiveConnection:uuid ##### --> -<para> -</para> -<!-- ##### STRUCT NMActiveConnectionClass ##### --> +<!-- ##### MACRO NM_ACTIVE_CONNECTION_DEFAULT ##### --> <para> </para> -@parent: -@_reserved1: -@_reserved2: -@_reserved3: -@_reserved4: -@_reserved5: -@_reserved6: -<!-- ##### MACRO NM_ACTIVE_CONNECTION_CONNECTION ##### --> + +<!-- ##### MACRO NM_ACTIVE_CONNECTION_DEFAULT6 ##### --> <para> </para> -<!-- ##### MACRO NM_ACTIVE_CONNECTION_DEFAULT ##### --> +<!-- ##### MACRO NM_ACTIVE_CONNECTION_MASTER ##### --> <para> </para> -<!-- ##### MACRO NM_ACTIVE_CONNECTION_DEFAULT6 ##### --> +<!-- ##### STRUCT NMActiveConnection ##### --> <para> </para> - -<!-- ##### MACRO NM_ACTIVE_CONNECTION_DEVICES ##### --> +<!-- ##### ARG NMActiveConnection:connection ##### --> <para> </para> +<!-- ##### ARG NMActiveConnection:default ##### --> +<para> +</para> -<!-- ##### MACRO NM_ACTIVE_CONNECTION_MASTER ##### --> +<!-- ##### ARG NMActiveConnection:default6 ##### --> <para> </para> +<!-- ##### ARG NMActiveConnection:devices ##### --> +<para> +</para> -<!-- ##### MACRO NM_ACTIVE_CONNECTION_SPECIFIC_OBJECT ##### --> +<!-- ##### ARG NMActiveConnection:master ##### --> <para> </para> +<!-- ##### ARG NMActiveConnection:specific-object ##### --> +<para> +</para> -<!-- ##### MACRO NM_ACTIVE_CONNECTION_STATE ##### --> +<!-- ##### ARG NMActiveConnection:state ##### --> <para> </para> +<!-- ##### ARG NMActiveConnection:uuid ##### --> +<para> +</para> -<!-- ##### MACRO NM_ACTIVE_CONNECTION_UUID ##### --> +<!-- ##### STRUCT NMActiveConnectionClass ##### --> <para> </para> +@parent: +@_reserved1: +@_reserved2: +@_reserved3: +@_reserved4: +@_reserved5: +@_reserved6: - -<!-- ##### FUNCTION nm_active_connection_get_connection ##### --> +<!-- ##### FUNCTION nm_active_connection_new ##### --> <para> </para> @connection: +@path: @Returns: -<!-- ##### FUNCTION nm_active_connection_get_default ##### --> +<!-- ##### FUNCTION nm_active_connection_get_connection ##### --> <para> </para> @@ -155,7 +156,7 @@ NMActiveConnection @Returns: -<!-- ##### FUNCTION nm_active_connection_get_default6 ##### --> +<!-- ##### FUNCTION nm_active_connection_get_uuid ##### --> <para> </para> @@ -164,7 +165,7 @@ NMActiveConnection @Returns: -<!-- ##### FUNCTION nm_active_connection_get_devices ##### --> +<!-- ##### FUNCTION nm_active_connection_get_specific_object ##### --> <para> </para> @@ -173,7 +174,7 @@ NMActiveConnection @Returns: -<!-- ##### FUNCTION nm_active_connection_get_master ##### --> +<!-- ##### FUNCTION nm_active_connection_get_devices ##### --> <para> </para> @@ -182,7 +183,7 @@ NMActiveConnection @Returns: -<!-- ##### FUNCTION nm_active_connection_get_specific_object ##### --> +<!-- ##### FUNCTION nm_active_connection_get_state ##### --> <para> </para> @@ -191,7 +192,7 @@ NMActiveConnection @Returns: -<!-- ##### FUNCTION nm_active_connection_get_state ##### --> +<!-- ##### FUNCTION nm_active_connection_get_default ##### --> <para> </para> @@ -200,7 +201,7 @@ NMActiveConnection @Returns: -<!-- ##### FUNCTION nm_active_connection_get_uuid ##### --> +<!-- ##### FUNCTION nm_active_connection_get_default6 ##### --> <para> </para> @@ -209,13 +210,12 @@ NMActiveConnection @Returns: -<!-- ##### FUNCTION nm_active_connection_new ##### --> +<!-- ##### FUNCTION nm_active_connection_get_master ##### --> <para> </para> @connection: -@path: @Returns: diff --git a/docs/libnm-glib/tmpl/nm-client.sgml b/docs/libnm-glib/tmpl/nm-client.sgml index c3443c40..2c439d61 100644 --- a/docs/libnm-glib/tmpl/nm-client.sgml +++ b/docs/libnm-glib/tmpl/nm-client.sgml @@ -22,130 +22,103 @@ NMClient <!-- ##### SECTION Image ##### --> -<!-- ##### STRUCT NMClient ##### --> +<!-- ##### MACRO NM_CLIENT_VERSION ##### --> <para> </para> -<!-- ##### SIGNAL NMClient::device-added ##### --> + +<!-- ##### MACRO NM_CLIENT_STATE ##### --> <para> </para> -@nmclient: the object which received the signal. -@arg1: -<!-- ##### SIGNAL NMClient::device-removed ##### --> + +<!-- ##### MACRO NM_CLIENT_MANAGER_RUNNING ##### --> <para> </para> -@nmclient: the object which received the signal. -@arg1: -<!-- ##### SIGNAL NMClient::permission-changed ##### --> + +<!-- ##### MACRO NM_CLIENT_NETWORKING_ENABLED ##### --> <para> </para> -@nmclient: the object which received the signal. -@arg1: -@arg2: -<!-- ##### ARG NMClient:active-connections ##### --> + +<!-- ##### MACRO NM_CLIENT_WIRELESS_ENABLED ##### --> <para> </para> -<!-- ##### ARG NMClient:manager-running ##### --> -<para> -</para> -<!-- ##### ARG NMClient:networking-enabled ##### --> +<!-- ##### MACRO NM_CLIENT_WIRELESS_HARDWARE_ENABLED ##### --> <para> </para> -<!-- ##### ARG NMClient:state ##### --> -<para> -</para> -<!-- ##### ARG NMClient:version ##### --> +<!-- ##### MACRO NM_CLIENT_WWAN_ENABLED ##### --> <para> </para> -<!-- ##### ARG NMClient:wimax-enabled ##### --> -<para> -</para> -<!-- ##### ARG NMClient:wimax-hardware-enabled ##### --> +<!-- ##### MACRO NM_CLIENT_WWAN_HARDWARE_ENABLED ##### --> <para> </para> -<!-- ##### ARG NMClient:wireless-enabled ##### --> -<para> -</para> -<!-- ##### ARG NMClient:wireless-hardware-enabled ##### --> +<!-- ##### MACRO NM_CLIENT_WIMAX_ENABLED ##### --> <para> </para> -<!-- ##### ARG NMClient:wwan-enabled ##### --> + + +<!-- ##### MACRO NM_CLIENT_WIMAX_HARDWARE_ENABLED ##### --> <para> </para> -<!-- ##### ARG NMClient:wwan-hardware-enabled ##### --> + + +<!-- ##### MACRO NM_CLIENT_ACTIVE_CONNECTIONS ##### --> <para> </para> -<!-- ##### USER_FUNCTION NMClientActivateFn ##### --> + + +<!-- ##### MACRO NM_CLIENT_CONNECTIVITY ##### --> <para> </para> -@client: -@active_connection: -@error: -@user_data: -<!-- ##### USER_FUNCTION NMClientAddActivateFn ##### --> +<!-- ##### MACRO NM_CLIENT_PRIMARY_CONNECTION ##### --> <para> </para> -@client: -@connection: -@new_connection_path: -@error: -@user_data: -<!-- ##### STRUCT NMClientClass ##### --> +<!-- ##### MACRO NM_CLIENT_ACTIVATING_CONNECTION ##### --> <para> </para> -@parent: -@device_added: -@device_removed: -@permission_changed: -@_reserved1: -@_reserved2: -@_reserved3: -@_reserved4: -@_reserved5: -@_reserved6: + <!-- ##### ENUM NMClientPermission ##### --> <para> @@ -176,81 +149,190 @@ NMClient @NM_CLIENT_PERMISSION_RESULT_AUTH: @NM_CLIENT_PERMISSION_RESULT_NO: -<!-- ##### MACRO NM_CLIENT_ACTIVE_CONNECTIONS ##### --> +<!-- ##### STRUCT NMClient ##### --> <para> </para> +<!-- ##### SIGNAL NMClient::device-added ##### --> +<para> -<!-- ##### MACRO NM_CLIENT_MANAGER_RUNNING ##### --> +</para> + +@nmclient: the object which received the signal. +@arg1: + +<!-- ##### SIGNAL NMClient::device-removed ##### --> <para> </para> +@nmclient: the object which received the signal. +@arg1: +<!-- ##### SIGNAL NMClient::permission-changed ##### --> +<para> -<!-- ##### MACRO NM_CLIENT_NETWORKING_ENABLED ##### --> +</para> + +@nmclient: the object which received the signal. +@arg1: +@arg2: + +<!-- ##### ARG NMClient:activating-connection ##### --> <para> </para> +<!-- ##### ARG NMClient:active-connections ##### --> +<para> +</para> -<!-- ##### MACRO NM_CLIENT_STATE ##### --> +<!-- ##### ARG NMClient:connectivity ##### --> <para> </para> +<!-- ##### ARG NMClient:manager-running ##### --> +<para> +</para> -<!-- ##### MACRO NM_CLIENT_VERSION ##### --> +<!-- ##### ARG NMClient:networking-enabled ##### --> <para> </para> +<!-- ##### ARG NMClient:primary-connection ##### --> +<para> +</para> -<!-- ##### MACRO NM_CLIENT_WIMAX_ENABLED ##### --> +<!-- ##### ARG NMClient:state ##### --> <para> </para> +<!-- ##### ARG NMClient:version ##### --> +<para> +</para> -<!-- ##### MACRO NM_CLIENT_WIMAX_HARDWARE_ENABLED ##### --> +<!-- ##### ARG NMClient:wimax-enabled ##### --> <para> </para> +<!-- ##### ARG NMClient:wimax-hardware-enabled ##### --> +<para> +</para> -<!-- ##### MACRO NM_CLIENT_WIRELESS_ENABLED ##### --> +<!-- ##### ARG NMClient:wireless-enabled ##### --> <para> </para> +<!-- ##### ARG NMClient:wireless-hardware-enabled ##### --> +<para> +</para> -<!-- ##### MACRO NM_CLIENT_WIRELESS_HARDWARE_ENABLED ##### --> +<!-- ##### ARG NMClient:wwan-enabled ##### --> <para> </para> +<!-- ##### ARG NMClient:wwan-hardware-enabled ##### --> +<para> +</para> -<!-- ##### MACRO NM_CLIENT_WWAN_ENABLED ##### --> +<!-- ##### STRUCT NMClientClass ##### --> +<para> + +</para> + +@parent: +@device_added: +@device_removed: +@permission_changed: +@_reserved1: +@_reserved2: +@_reserved3: +@_reserved4: +@_reserved5: +@_reserved6: + +<!-- ##### FUNCTION nm_client_new ##### --> <para> </para> +@void: +@Returns: -<!-- ##### MACRO NM_CLIENT_WWAN_HARDWARE_ENABLED ##### --> +<!-- ##### FUNCTION nm_client_new_async ##### --> +<para> + +</para> + +@cancellable: +@callback: +@user_data: + + +<!-- ##### FUNCTION nm_client_new_finish ##### --> +<para> + +</para> + +@result: +@error: +@Returns: + + +<!-- ##### FUNCTION nm_client_get_devices ##### --> +<para> + +</para> + +@client: +@Returns: + + +<!-- ##### FUNCTION nm_client_get_device_by_path ##### --> +<para> + +</para> + +@client: +@object_path: +@Returns: + + +<!-- ##### FUNCTION nm_client_get_device_by_iface ##### --> +<para> + +</para> + +@client: +@iface: +@Returns: + + +<!-- ##### USER_FUNCTION NMClientActivateFn ##### --> <para> </para> +@client: +@active_connection: +@error: +@user_data: <!-- ##### FUNCTION nm_client_activate_connection ##### --> @@ -266,6 +348,18 @@ NMClient @user_data: +<!-- ##### USER_FUNCTION NMClientAddActivateFn ##### --> +<para> + +</para> + +@client: +@connection: +@new_connection_path: +@error: +@user_data: + + <!-- ##### FUNCTION nm_client_add_and_activate_connection ##### --> <para> @@ -288,7 +382,7 @@ NMClient @active: -<!-- ##### FUNCTION nm_client_get_active_connections ##### --> +<!-- ##### FUNCTION nm_client_networking_get_enabled ##### --> <para> </para> @@ -297,48 +391,43 @@ NMClient @Returns: -<!-- ##### FUNCTION nm_client_get_device_by_iface ##### --> +<!-- ##### FUNCTION nm_client_networking_set_enabled ##### --> <para> </para> @client: -@iface: -@Returns: +@enabled: -<!-- ##### FUNCTION nm_client_get_device_by_path ##### --> +<!-- ##### FUNCTION nm_client_wireless_get_enabled ##### --> <para> </para> @client: -@object_path: @Returns: -<!-- ##### FUNCTION nm_client_get_devices ##### --> +<!-- ##### FUNCTION nm_client_wireless_set_enabled ##### --> <para> </para> @client: -@Returns: +@enabled: -<!-- ##### FUNCTION nm_client_get_logging ##### --> +<!-- ##### FUNCTION nm_client_wireless_hardware_get_enabled ##### --> <para> </para> @client: -@level: -@domains: -@error: @Returns: -<!-- ##### FUNCTION nm_client_get_manager_running ##### --> +<!-- ##### FUNCTION nm_client_wwan_get_enabled ##### --> <para> </para> @@ -347,17 +436,16 @@ NMClient @Returns: -<!-- ##### FUNCTION nm_client_get_permission_result ##### --> +<!-- ##### FUNCTION nm_client_wwan_set_enabled ##### --> <para> </para> @client: -@permission: -@Returns: +@enabled: -<!-- ##### FUNCTION nm_client_get_state ##### --> +<!-- ##### FUNCTION nm_client_wwan_hardware_get_enabled ##### --> <para> </para> @@ -366,7 +454,7 @@ NMClient @Returns: -<!-- ##### FUNCTION nm_client_get_version ##### --> +<!-- ##### FUNCTION nm_client_wimax_get_enabled ##### --> <para> </para> @@ -375,62 +463,57 @@ NMClient @Returns: -<!-- ##### FUNCTION nm_client_networking_get_enabled ##### --> +<!-- ##### FUNCTION nm_client_wimax_set_enabled ##### --> <para> </para> @client: -@Returns: +@enabled: -<!-- ##### FUNCTION nm_client_networking_set_enabled ##### --> +<!-- ##### FUNCTION nm_client_wimax_hardware_get_enabled ##### --> <para> </para> @client: -@enabled: +@Returns: -<!-- ##### FUNCTION nm_client_new ##### --> +<!-- ##### FUNCTION nm_client_get_version ##### --> <para> </para> -@void: +@client: @Returns: -<!-- ##### FUNCTION nm_client_new_async ##### --> +<!-- ##### FUNCTION nm_client_get_state ##### --> <para> </para> -@cancellable: -@callback: -@user_data: +@client: +@Returns: -<!-- ##### FUNCTION nm_client_new_finish ##### --> +<!-- ##### FUNCTION nm_client_get_manager_running ##### --> <para> </para> -@result: -@error: +@client: @Returns: -<!-- ##### FUNCTION nm_client_set_logging ##### --> +<!-- ##### FUNCTION nm_client_get_active_connections ##### --> <para> </para> @client: -@level: -@domains: -@error: @Returns: @@ -443,34 +526,41 @@ NMClient @sleep_: -<!-- ##### FUNCTION nm_client_wimax_get_enabled ##### --> +<!-- ##### FUNCTION nm_client_get_permission_result ##### --> <para> </para> @client: +@permission: @Returns: -<!-- ##### FUNCTION nm_client_wimax_hardware_get_enabled ##### --> +<!-- ##### FUNCTION nm_client_get_logging ##### --> <para> </para> @client: +@level: +@domains: +@error: @Returns: -<!-- ##### FUNCTION nm_client_wimax_set_enabled ##### --> +<!-- ##### FUNCTION nm_client_set_logging ##### --> <para> </para> @client: -@enabled: +@level: +@domains: +@error: +@Returns: -<!-- ##### FUNCTION nm_client_wireless_get_enabled ##### --> +<!-- ##### FUNCTION nm_client_get_connectivity ##### --> <para> </para> @@ -479,34 +569,40 @@ NMClient @Returns: -<!-- ##### FUNCTION nm_client_wireless_hardware_get_enabled ##### --> +<!-- ##### FUNCTION nm_client_check_connectivity ##### --> <para> </para> @client: +@cancellable: +@error: @Returns: -<!-- ##### FUNCTION nm_client_wireless_set_enabled ##### --> +<!-- ##### FUNCTION nm_client_check_connectivity_async ##### --> <para> </para> @client: -@enabled: +@cancellable: +@callback: +@user_data: -<!-- ##### FUNCTION nm_client_wwan_get_enabled ##### --> +<!-- ##### FUNCTION nm_client_check_connectivity_finish ##### --> <para> </para> @client: +@result: +@error: @Returns: -<!-- ##### FUNCTION nm_client_wwan_hardware_get_enabled ##### --> +<!-- ##### FUNCTION nm_client_get_primary_connection ##### --> <para> </para> @@ -515,12 +611,12 @@ NMClient @Returns: -<!-- ##### FUNCTION nm_client_wwan_set_enabled ##### --> +<!-- ##### FUNCTION nm_client_get_activating_connection ##### --> <para> </para> @client: -@enabled: +@Returns: diff --git a/docs/libnm-glib/tmpl/nm-device-adsl.sgml b/docs/libnm-glib/tmpl/nm-device-adsl.sgml index 286f2f41..111cf8a6 100644 --- a/docs/libnm-glib/tmpl/nm-device-adsl.sgml +++ b/docs/libnm-glib/tmpl/nm-device-adsl.sgml @@ -22,38 +22,30 @@ NMDeviceAdsl <!-- ##### SECTION Image ##### --> -<!-- ##### STRUCT NMDeviceAdsl ##### --> +<!-- ##### ENUM NMDeviceAdslError ##### --> <para> </para> +@NM_DEVICE_ADSL_ERROR_UNKNOWN: +@NM_DEVICE_ADSL_ERROR_NOT_ADSL_CONNECTION: +@NM_DEVICE_ADSL_ERROR_INVALID_ADSL_CONNECTION: -<!-- ##### ARG NMDeviceAdsl:carrier ##### --> +<!-- ##### MACRO NM_DEVICE_ADSL_ERROR ##### --> <para> </para> -<!-- ##### STRUCT NMDeviceAdslClass ##### --> -<para> -</para> -@parent: -@_reserved1: -@_reserved2: -@_reserved3: -@_reserved4: -@_reserved5: -@_reserved6: - -<!-- ##### ENUM NMDeviceAdslError ##### --> +<!-- ##### FUNCTION nm_device_adsl_error_quark ##### --> <para> </para> -@NM_DEVICE_ADSL_ERROR_UNKNOWN: -@NM_DEVICE_ADSL_ERROR_NOT_ADSL_CONNECTION: -@NM_DEVICE_ADSL_ERROR_INVALID_ADSL_CONNECTION: +@void: +@Returns: + <!-- ##### MACRO NM_DEVICE_ADSL_CARRIER ##### --> <para> @@ -62,38 +54,46 @@ NMDeviceAdsl -<!-- ##### MACRO NM_DEVICE_ADSL_ERROR ##### --> +<!-- ##### STRUCT NMDeviceAdsl ##### --> <para> </para> - -<!-- ##### FUNCTION nm_device_adsl_error_quark ##### --> +<!-- ##### ARG NMDeviceAdsl:carrier ##### --> <para> </para> -@void: -@Returns: +<!-- ##### STRUCT NMDeviceAdslClass ##### --> +<para> +</para> -<!-- ##### FUNCTION nm_device_adsl_get_carrier ##### --> +@parent: +@_reserved1: +@_reserved2: +@_reserved3: +@_reserved4: +@_reserved5: +@_reserved6: + +<!-- ##### FUNCTION nm_device_adsl_new ##### --> <para> </para> -@device: +@connection: +@path: @Returns: -<!-- ##### FUNCTION nm_device_adsl_new ##### --> +<!-- ##### FUNCTION nm_device_adsl_get_carrier ##### --> <para> </para> -@connection: -@path: +@device: @Returns: diff --git a/docs/libnm-glib/tmpl/nm-device-bond.sgml b/docs/libnm-glib/tmpl/nm-device-bond.sgml index 29c46c9a..cc85389d 100644 --- a/docs/libnm-glib/tmpl/nm-device-bond.sgml +++ b/docs/libnm-glib/tmpl/nm-device-bond.sgml @@ -22,49 +22,38 @@ NMDeviceBond <!-- ##### SECTION Image ##### --> -<!-- ##### STRUCT NMDeviceBond ##### --> +<!-- ##### ENUM NMDeviceBondError ##### --> <para> </para> +@NM_DEVICE_BOND_ERROR_UNKNOWN: +@NM_DEVICE_BOND_ERROR_NOT_BOND_CONNECTION: +@NM_DEVICE_BOND_ERROR_INVALID_BOND_CONNECTION: +@NM_DEVICE_BOND_ERROR_INTERFACE_MISMATCH: -<!-- ##### ARG NMDeviceBond:carrier ##### --> +<!-- ##### MACRO NM_DEVICE_BOND_ERROR ##### --> <para> </para> -<!-- ##### ARG NMDeviceBond:hw-address ##### --> -<para> -</para> -<!-- ##### ARG NMDeviceBond:slaves ##### --> +<!-- ##### FUNCTION nm_device_bond_error_quark ##### --> <para> </para> -<!-- ##### STRUCT NMDeviceBondClass ##### --> -<para> - -</para> +@void: +@Returns: -@parent: -@_reserved1: -@_reserved2: -@_reserved3: -@_reserved4: -@_reserved5: -@_reserved6: -<!-- ##### ENUM NMDeviceBondError ##### --> +<!-- ##### MACRO NM_DEVICE_BOND_HW_ADDRESS ##### --> <para> </para> -@NM_DEVICE_BOND_ERROR_UNKNOWN: -@NM_DEVICE_BOND_ERROR_NOT_BOND_CONNECTION: -@NM_DEVICE_BOND_ERROR_INVALID_BOND_CONNECTION: -@NM_DEVICE_BOND_ERROR_INTERFACE_MISMATCH: + <!-- ##### MACRO NM_DEVICE_BOND_CARRIER ##### --> <para> @@ -73,42 +62,54 @@ NMDeviceBond -<!-- ##### MACRO NM_DEVICE_BOND_ERROR ##### --> +<!-- ##### MACRO NM_DEVICE_BOND_SLAVES ##### --> <para> </para> -<!-- ##### MACRO NM_DEVICE_BOND_HW_ADDRESS ##### --> +<!-- ##### STRUCT NMDeviceBond ##### --> <para> </para> - -<!-- ##### MACRO NM_DEVICE_BOND_SLAVES ##### --> +<!-- ##### ARG NMDeviceBond:carrier ##### --> <para> </para> +<!-- ##### ARG NMDeviceBond:hw-address ##### --> +<para> +</para> -<!-- ##### FUNCTION nm_device_bond_error_quark ##### --> +<!-- ##### ARG NMDeviceBond:slaves ##### --> <para> </para> -@void: -@Returns: +<!-- ##### STRUCT NMDeviceBondClass ##### --> +<para> +</para> -<!-- ##### FUNCTION nm_device_bond_get_carrier ##### --> +@parent: +@_reserved1: +@_reserved2: +@_reserved3: +@_reserved4: +@_reserved5: +@_reserved6: + +<!-- ##### FUNCTION nm_device_bond_new ##### --> <para> </para> -@device: +@connection: +@path: @Returns: @@ -121,7 +122,7 @@ NMDeviceBond @Returns: -<!-- ##### FUNCTION nm_device_bond_get_slaves ##### --> +<!-- ##### FUNCTION nm_device_bond_get_carrier ##### --> <para> </para> @@ -130,13 +131,12 @@ NMDeviceBond @Returns: -<!-- ##### FUNCTION nm_device_bond_new ##### --> +<!-- ##### FUNCTION nm_device_bond_get_slaves ##### --> <para> </para> -@connection: -@path: +@device: @Returns: diff --git a/docs/libnm-glib/tmpl/nm-device-bridge.sgml b/docs/libnm-glib/tmpl/nm-device-bridge.sgml index 9d20554e..3570bae3 100644 --- a/docs/libnm-glib/tmpl/nm-device-bridge.sgml +++ b/docs/libnm-glib/tmpl/nm-device-bridge.sgml @@ -22,49 +22,38 @@ NMDeviceBridge <!-- ##### SECTION Image ##### --> -<!-- ##### STRUCT NMDeviceBridge ##### --> +<!-- ##### ENUM NMDeviceBridgeError ##### --> <para> </para> +@NM_DEVICE_BRIDGE_ERROR_UNKNOWN: +@NM_DEVICE_BRIDGE_ERROR_NOT_BRIDGE_CONNECTION: +@NM_DEVICE_BRIDGE_ERROR_INVALID_BRIDGE_CONNECTION: +@NM_DEVICE_BRIDGE_ERROR_INTERFACE_MISMATCH: -<!-- ##### ARG NMDeviceBridge:carrier ##### --> +<!-- ##### MACRO NM_DEVICE_BRIDGE_ERROR ##### --> <para> </para> -<!-- ##### ARG NMDeviceBridge:hw-address ##### --> -<para> -</para> -<!-- ##### ARG NMDeviceBridge:slaves ##### --> +<!-- ##### FUNCTION nm_device_bridge_error_quark ##### --> <para> </para> -<!-- ##### STRUCT NMDeviceBridgeClass ##### --> -<para> - -</para> +@void: +@Returns: -@parent: -@_reserved1: -@_reserved2: -@_reserved3: -@_reserved4: -@_reserved5: -@_reserved6: -<!-- ##### ENUM NMDeviceBridgeError ##### --> +<!-- ##### MACRO NM_DEVICE_BRIDGE_HW_ADDRESS ##### --> <para> </para> -@NM_DEVICE_BRIDGE_ERROR_UNKNOWN: -@NM_DEVICE_BRIDGE_ERROR_NOT_BRIDGE_CONNECTION: -@NM_DEVICE_BRIDGE_ERROR_INVALID_BRIDGE_CONNECTION: -@NM_DEVICE_BRIDGE_ERROR_INTERFACE_MISMATCH: + <!-- ##### MACRO NM_DEVICE_BRIDGE_CARRIER ##### --> <para> @@ -73,42 +62,54 @@ NMDeviceBridge -<!-- ##### MACRO NM_DEVICE_BRIDGE_ERROR ##### --> +<!-- ##### MACRO NM_DEVICE_BRIDGE_SLAVES ##### --> <para> </para> -<!-- ##### MACRO NM_DEVICE_BRIDGE_HW_ADDRESS ##### --> +<!-- ##### STRUCT NMDeviceBridge ##### --> <para> </para> - -<!-- ##### MACRO NM_DEVICE_BRIDGE_SLAVES ##### --> +<!-- ##### ARG NMDeviceBridge:carrier ##### --> <para> </para> +<!-- ##### ARG NMDeviceBridge:hw-address ##### --> +<para> +</para> -<!-- ##### FUNCTION nm_device_bridge_error_quark ##### --> +<!-- ##### ARG NMDeviceBridge:slaves ##### --> <para> </para> -@void: -@Returns: +<!-- ##### STRUCT NMDeviceBridgeClass ##### --> +<para> +</para> -<!-- ##### FUNCTION nm_device_bridge_get_carrier ##### --> +@parent: +@_reserved1: +@_reserved2: +@_reserved3: +@_reserved4: +@_reserved5: +@_reserved6: + +<!-- ##### FUNCTION nm_device_bridge_new ##### --> <para> </para> -@device: +@connection: +@path: @Returns: @@ -121,7 +122,7 @@ NMDeviceBridge @Returns: -<!-- ##### FUNCTION nm_device_bridge_get_slaves ##### --> +<!-- ##### FUNCTION nm_device_bridge_get_carrier ##### --> <para> </para> @@ -130,13 +131,12 @@ NMDeviceBridge @Returns: -<!-- ##### FUNCTION nm_device_bridge_new ##### --> +<!-- ##### FUNCTION nm_device_bridge_get_slaves ##### --> <para> </para> -@connection: -@path: +@device: @Returns: diff --git a/docs/libnm-glib/tmpl/nm-device-bt.sgml b/docs/libnm-glib/tmpl/nm-device-bt.sgml index e0b17425..404ec888 100644 --- a/docs/libnm-glib/tmpl/nm-device-bt.sgml +++ b/docs/libnm-glib/tmpl/nm-device-bt.sgml @@ -22,51 +22,47 @@ NMDeviceBt <!-- ##### SECTION Image ##### --> -<!-- ##### STRUCT NMDeviceBt ##### --> +<!-- ##### ENUM NMDeviceBtError ##### --> <para> </para> +@NM_DEVICE_BT_ERROR_UNKNOWN: +@NM_DEVICE_BT_ERROR_NOT_BT_CONNECTION: +@NM_DEVICE_BT_ERROR_INVALID_BT_CONNECTION: +@NM_DEVICE_BT_ERROR_INVALID_DEVICE_MAC: +@NM_DEVICE_BT_ERROR_MAC_MISMATCH: +@NM_DEVICE_BT_ERROR_MISSING_DEVICE_CAPS: -<!-- ##### ARG NMDeviceBt:bt-capabilities ##### --> +<!-- ##### MACRO NM_DEVICE_BT_ERROR ##### --> <para> </para> -<!-- ##### ARG NMDeviceBt:hw-address ##### --> -<para> -</para> -<!-- ##### ARG NMDeviceBt:name ##### --> +<!-- ##### FUNCTION nm_device_bt_error_quark ##### --> <para> </para> -<!-- ##### STRUCT NMDeviceBtClass ##### --> +@void: +@Returns: + + +<!-- ##### MACRO NM_DEVICE_BT_HW_ADDRESS ##### --> <para> </para> -@parent: -@_reserved1: -@_reserved2: -@_reserved3: -@_reserved4: -@_reserved5: -@_reserved6: -<!-- ##### ENUM NMDeviceBtError ##### --> + +<!-- ##### MACRO NM_DEVICE_BT_NAME ##### --> <para> </para> -@NM_DEVICE_BT_ERROR_UNKNOWN: -@NM_DEVICE_BT_ERROR_NOT_BT_CONNECTION: -@NM_DEVICE_BT_ERROR_INVALID_BT_CONNECTION: -@NM_DEVICE_BT_ERROR_INVALID_DEVICE_MAC: -@NM_DEVICE_BT_ERROR_MAC_MISMATCH: -@NM_DEVICE_BT_ERROR_MISSING_DEVICE_CAPS: + <!-- ##### MACRO NM_DEVICE_BT_CAPABILITIES ##### --> <para> @@ -75,42 +71,47 @@ NMDeviceBt -<!-- ##### MACRO NM_DEVICE_BT_ERROR ##### --> +<!-- ##### STRUCT NMDeviceBt ##### --> <para> </para> - -<!-- ##### MACRO NM_DEVICE_BT_HW_ADDRESS ##### --> +<!-- ##### ARG NMDeviceBt:bt-capabilities ##### --> <para> </para> - - -<!-- ##### MACRO NM_DEVICE_BT_NAME ##### --> +<!-- ##### ARG NMDeviceBt:hw-address ##### --> <para> </para> +<!-- ##### ARG NMDeviceBt:name ##### --> +<para> +</para> -<!-- ##### FUNCTION nm_device_bt_error_quark ##### --> +<!-- ##### STRUCT NMDeviceBtClass ##### --> <para> </para> -@void: -@Returns: - +@parent: +@_reserved1: +@_reserved2: +@_reserved3: +@_reserved4: +@_reserved5: +@_reserved6: -<!-- ##### FUNCTION nm_device_bt_get_capabilities ##### --> +<!-- ##### FUNCTION nm_device_bt_new ##### --> <para> </para> -@device: +@connection: +@path: @Returns: @@ -132,13 +133,12 @@ NMDeviceBt @Returns: -<!-- ##### FUNCTION nm_device_bt_new ##### --> +<!-- ##### FUNCTION nm_device_bt_get_capabilities ##### --> <para> </para> -@connection: -@path: +@device: @Returns: diff --git a/docs/libnm-glib/tmpl/nm-device-ethernet.sgml b/docs/libnm-glib/tmpl/nm-device-ethernet.sgml index 3f5735b5..a3771275 100644 --- a/docs/libnm-glib/tmpl/nm-device-ethernet.sgml +++ b/docs/libnm-glib/tmpl/nm-device-ethernet.sgml @@ -22,106 +22,107 @@ NMDeviceEthernet <!-- ##### SECTION Image ##### --> -<!-- ##### STRUCT NMDeviceEthernet ##### --> +<!-- ##### ENUM NMDeviceEthernetError ##### --> <para> </para> +@NM_DEVICE_ETHERNET_ERROR_UNKNOWN: +@NM_DEVICE_ETHERNET_ERROR_NOT_ETHERNET_CONNECTION: +@NM_DEVICE_ETHERNET_ERROR_INVALID_ETHERNET_CONNECTION: +@NM_DEVICE_ETHERNET_ERROR_INVALID_DEVICE_MAC: +@NM_DEVICE_ETHERNET_ERROR_MAC_MISMATCH: -<!-- ##### ARG NMDeviceEthernet:carrier ##### --> +<!-- ##### MACRO NM_DEVICE_ETHERNET_ERROR ##### --> <para> </para> -<!-- ##### ARG NMDeviceEthernet:hw-address ##### --> -<para> -</para> -<!-- ##### ARG NMDeviceEthernet:perm-hw-address ##### --> +<!-- ##### FUNCTION nm_device_ethernet_error_quark ##### --> <para> </para> -<!-- ##### ARG NMDeviceEthernet:speed ##### --> -<para> +@void: +@Returns: -</para> -<!-- ##### STRUCT NMDeviceEthernetClass ##### --> +<!-- ##### MACRO NM_DEVICE_ETHERNET_HW_ADDRESS ##### --> <para> </para> -@parent: -@_reserved1: -@_reserved2: -@_reserved3: -@_reserved4: -@_reserved5: -@_reserved6: -<!-- ##### ENUM NMDeviceEthernetError ##### --> + +<!-- ##### MACRO NM_DEVICE_ETHERNET_PERMANENT_HW_ADDRESS ##### --> <para> </para> -@NM_DEVICE_ETHERNET_ERROR_UNKNOWN: -@NM_DEVICE_ETHERNET_ERROR_NOT_ETHERNET_CONNECTION: -@NM_DEVICE_ETHERNET_ERROR_INVALID_ETHERNET_CONNECTION: -@NM_DEVICE_ETHERNET_ERROR_INVALID_DEVICE_MAC: -@NM_DEVICE_ETHERNET_ERROR_MAC_MISMATCH: -<!-- ##### MACRO NM_DEVICE_ETHERNET_CARRIER ##### --> + +<!-- ##### MACRO NM_DEVICE_ETHERNET_SPEED ##### --> <para> </para> -<!-- ##### MACRO NM_DEVICE_ETHERNET_ERROR ##### --> +<!-- ##### MACRO NM_DEVICE_ETHERNET_CARRIER ##### --> <para> </para> -<!-- ##### MACRO NM_DEVICE_ETHERNET_HW_ADDRESS ##### --> +<!-- ##### STRUCT NMDeviceEthernet ##### --> <para> </para> - -<!-- ##### MACRO NM_DEVICE_ETHERNET_PERMANENT_HW_ADDRESS ##### --> +<!-- ##### ARG NMDeviceEthernet:carrier ##### --> <para> </para> +<!-- ##### ARG NMDeviceEthernet:hw-address ##### --> +<para> +</para> -<!-- ##### MACRO NM_DEVICE_ETHERNET_SPEED ##### --> +<!-- ##### ARG NMDeviceEthernet:perm-hw-address ##### --> <para> </para> +<!-- ##### ARG NMDeviceEthernet:speed ##### --> +<para> +</para> -<!-- ##### FUNCTION nm_device_ethernet_error_quark ##### --> +<!-- ##### STRUCT NMDeviceEthernetClass ##### --> <para> </para> -@void: -@Returns: - +@parent: +@_reserved1: +@_reserved2: +@_reserved3: +@_reserved4: +@_reserved5: +@_reserved6: -<!-- ##### FUNCTION nm_device_ethernet_get_carrier ##### --> +<!-- ##### FUNCTION nm_device_ethernet_new ##### --> <para> </para> -@device: +@connection: +@path: @Returns: @@ -152,13 +153,12 @@ NMDeviceEthernet @Returns: -<!-- ##### FUNCTION nm_device_ethernet_new ##### --> +<!-- ##### FUNCTION nm_device_ethernet_get_carrier ##### --> <para> </para> -@connection: -@path: +@device: @Returns: diff --git a/docs/libnm-glib/tmpl/nm-device-infiniband.sgml b/docs/libnm-glib/tmpl/nm-device-infiniband.sgml index 94ad7b90..f50d415f 100644 --- a/docs/libnm-glib/tmpl/nm-device-infiniband.sgml +++ b/docs/libnm-glib/tmpl/nm-device-infiniband.sgml @@ -22,45 +22,39 @@ NMDeviceInfiniband <!-- ##### SECTION Image ##### --> -<!-- ##### STRUCT NMDeviceInfiniband ##### --> +<!-- ##### ENUM NMDeviceInfinibandError ##### --> <para> </para> +@NM_DEVICE_INFINIBAND_ERROR_UNKNOWN: +@NM_DEVICE_INFINIBAND_ERROR_NOT_INFINIBAND_CONNECTION: +@NM_DEVICE_INFINIBAND_ERROR_INVALID_INFINIBAND_CONNECTION: +@NM_DEVICE_INFINIBAND_ERROR_INVALID_DEVICE_MAC: +@NM_DEVICE_INFINIBAND_ERROR_MAC_MISMATCH: -<!-- ##### ARG NMDeviceInfiniband:carrier ##### --> +<!-- ##### MACRO NM_DEVICE_INFINIBAND_ERROR ##### --> <para> </para> -<!-- ##### ARG NMDeviceInfiniband:hw-address ##### --> -<para> -</para> -<!-- ##### STRUCT NMDeviceInfinibandClass ##### --> +<!-- ##### FUNCTION nm_device_infiniband_error_quark ##### --> <para> </para> -@parent: -@_reserved1: -@_reserved2: -@_reserved3: -@_reserved4: -@_reserved5: -@_reserved6: +@void: +@Returns: -<!-- ##### ENUM NMDeviceInfinibandError ##### --> + +<!-- ##### MACRO NM_DEVICE_INFINIBAND_HW_ADDRESS ##### --> <para> </para> -@NM_DEVICE_INFINIBAND_ERROR_UNKNOWN: -@NM_DEVICE_INFINIBAND_ERROR_NOT_INFINIBAND_CONNECTION: -@NM_DEVICE_INFINIBAND_ERROR_INVALID_INFINIBAND_CONNECTION: -@NM_DEVICE_INFINIBAND_ERROR_INVALID_DEVICE_MAC: -@NM_DEVICE_INFINIBAND_ERROR_MAC_MISMATCH: + <!-- ##### MACRO NM_DEVICE_INFINIBAND_CARRIER ##### --> <para> @@ -69,35 +63,42 @@ NMDeviceInfiniband -<!-- ##### MACRO NM_DEVICE_INFINIBAND_ERROR ##### --> +<!-- ##### STRUCT NMDeviceInfiniband ##### --> <para> </para> - -<!-- ##### MACRO NM_DEVICE_INFINIBAND_HW_ADDRESS ##### --> +<!-- ##### ARG NMDeviceInfiniband:carrier ##### --> <para> </para> +<!-- ##### ARG NMDeviceInfiniband:hw-address ##### --> +<para> +</para> -<!-- ##### FUNCTION nm_device_infiniband_error_quark ##### --> +<!-- ##### STRUCT NMDeviceInfinibandClass ##### --> <para> </para> -@void: -@Returns: - +@parent: +@_reserved1: +@_reserved2: +@_reserved3: +@_reserved4: +@_reserved5: +@_reserved6: -<!-- ##### FUNCTION nm_device_infiniband_get_carrier ##### --> +<!-- ##### FUNCTION nm_device_infiniband_new ##### --> <para> </para> -@device: +@connection: +@path: @Returns: @@ -110,13 +111,12 @@ NMDeviceInfiniband @Returns: -<!-- ##### FUNCTION nm_device_infiniband_new ##### --> +<!-- ##### FUNCTION nm_device_infiniband_get_carrier ##### --> <para> </para> -@connection: -@path: +@device: @Returns: diff --git a/docs/libnm-glib/tmpl/nm-device-modem.sgml b/docs/libnm-glib/tmpl/nm-device-modem.sgml index e41c07ec..4e1cc83a 100644 --- a/docs/libnm-glib/tmpl/nm-device-modem.sgml +++ b/docs/libnm-glib/tmpl/nm-device-modem.sgml @@ -22,44 +22,38 @@ NMDeviceModem <!-- ##### SECTION Image ##### --> -<!-- ##### STRUCT NMDeviceModem ##### --> +<!-- ##### ENUM NMDeviceModemError ##### --> <para> </para> +@NM_DEVICE_MODEM_ERROR_UNKNOWN: +@NM_DEVICE_MODEM_ERROR_NOT_MODEM_CONNECTION: +@NM_DEVICE_MODEM_ERROR_INVALID_MODEM_CONNECTION: +@NM_DEVICE_MODEM_ERROR_MISSING_DEVICE_CAPS: -<!-- ##### ARG NMDeviceModem:current-capabilities ##### --> +<!-- ##### MACRO NM_DEVICE_MODEM_ERROR ##### --> <para> </para> -<!-- ##### ARG NMDeviceModem:modem-capabilities ##### --> -<para> -</para> -<!-- ##### STRUCT NMDeviceModemClass ##### --> +<!-- ##### FUNCTION nm_device_modem_error_quark ##### --> <para> </para> -@parent: -@_reserved1: -@_reserved2: -@_reserved3: -@_reserved4: -@_reserved5: -@_reserved6: +@void: +@Returns: -<!-- ##### ENUM NMDeviceModemError ##### --> + +<!-- ##### MACRO NM_DEVICE_MODEM_MODEM_CAPABILITIES ##### --> <para> </para> -@NM_DEVICE_MODEM_ERROR_UNKNOWN: -@NM_DEVICE_MODEM_ERROR_NOT_MODEM_CONNECTION: -@NM_DEVICE_MODEM_ERROR_INVALID_MODEM_CONNECTION: -@NM_DEVICE_MODEM_ERROR_MISSING_DEVICE_CAPS: + <!-- ##### MACRO NM_DEVICE_MODEM_CURRENT_CAPABILITIES ##### --> <para> @@ -68,30 +62,36 @@ NMDeviceModem -<!-- ##### MACRO NM_DEVICE_MODEM_ERROR ##### --> +<!-- ##### STRUCT NMDeviceModem ##### --> <para> </para> - -<!-- ##### MACRO NM_DEVICE_MODEM_MODEM_CAPABILITIES ##### --> +<!-- ##### ARG NMDeviceModem:current-capabilities ##### --> <para> </para> +<!-- ##### ARG NMDeviceModem:modem-capabilities ##### --> +<para> +</para> -<!-- ##### FUNCTION nm_device_modem_error_quark ##### --> +<!-- ##### STRUCT NMDeviceModemClass ##### --> <para> </para> -@void: -@Returns: - +@parent: +@_reserved1: +@_reserved2: +@_reserved3: +@_reserved4: +@_reserved5: +@_reserved6: -<!-- ##### FUNCTION nm_device_modem_get_current_capabilities ##### --> +<!-- ##### FUNCTION nm_device_modem_get_modem_capabilities ##### --> <para> </para> @@ -100,7 +100,7 @@ NMDeviceModem @Returns: -<!-- ##### FUNCTION nm_device_modem_get_modem_capabilities ##### --> +<!-- ##### FUNCTION nm_device_modem_get_current_capabilities ##### --> <para> </para> diff --git a/docs/libnm-glib/tmpl/nm-device-olpc-mesh.sgml b/docs/libnm-glib/tmpl/nm-device-olpc-mesh.sgml index 20c63328..fb78ba35 100644 --- a/docs/libnm-glib/tmpl/nm-device-olpc-mesh.sgml +++ b/docs/libnm-glib/tmpl/nm-device-olpc-mesh.sgml @@ -22,48 +22,44 @@ NMDeviceOlpcMesh <!-- ##### SECTION Image ##### --> -<!-- ##### STRUCT NMDeviceOlpcMesh ##### --> +<!-- ##### ENUM NMDeviceOlpcMeshError ##### --> <para> </para> +@NM_DEVICE_OLPC_MESH_ERROR_UNKNOWN: +@NM_DEVICE_OLPC_MESH_ERROR_NOT_OLPC_MESH_CONNECTION: +@NM_DEVICE_OLPC_MESH_ERROR_INVALID_OLPC_MESH_CONNECTION: -<!-- ##### ARG NMDeviceOlpcMesh:active-channel ##### --> +<!-- ##### MACRO NM_DEVICE_OLPC_MESH_ERROR ##### --> <para> </para> -<!-- ##### ARG NMDeviceOlpcMesh:companion ##### --> -<para> -</para> -<!-- ##### ARG NMDeviceOlpcMesh:hw-address ##### --> +<!-- ##### FUNCTION nm_device_olpc_mesh_error_quark ##### --> <para> </para> -<!-- ##### STRUCT NMDeviceOlpcMeshClass ##### --> +@void: +@Returns: + + +<!-- ##### MACRO NM_DEVICE_OLPC_MESH_HW_ADDRESS ##### --> <para> </para> -@parent: -@_reserved1: -@_reserved2: -@_reserved3: -@_reserved4: -@_reserved5: -@_reserved6: -<!-- ##### ENUM NMDeviceOlpcMeshError ##### --> + +<!-- ##### MACRO NM_DEVICE_OLPC_MESH_COMPANION ##### --> <para> </para> -@NM_DEVICE_OLPC_MESH_ERROR_UNKNOWN: -@NM_DEVICE_OLPC_MESH_ERROR_NOT_OLPC_MESH_CONNECTION: -@NM_DEVICE_OLPC_MESH_ERROR_INVALID_OLPC_MESH_CONNECTION: + <!-- ##### MACRO NM_DEVICE_OLPC_MESH_ACTIVE_CHANNEL ##### --> <para> @@ -72,46 +68,51 @@ NMDeviceOlpcMesh -<!-- ##### MACRO NM_DEVICE_OLPC_MESH_COMPANION ##### --> +<!-- ##### STRUCT NMDeviceOlpcMesh ##### --> <para> </para> - -<!-- ##### MACRO NM_DEVICE_OLPC_MESH_ERROR ##### --> +<!-- ##### ARG NMDeviceOlpcMesh:active-channel ##### --> <para> </para> - - -<!-- ##### MACRO NM_DEVICE_OLPC_MESH_HW_ADDRESS ##### --> +<!-- ##### ARG NMDeviceOlpcMesh:companion ##### --> <para> </para> +<!-- ##### ARG NMDeviceOlpcMesh:hw-address ##### --> +<para> +</para> -<!-- ##### FUNCTION nm_device_olpc_mesh_error_quark ##### --> +<!-- ##### STRUCT NMDeviceOlpcMeshClass ##### --> <para> </para> -@void: -@Returns: - +@parent: +@_reserved1: +@_reserved2: +@_reserved3: +@_reserved4: +@_reserved5: +@_reserved6: -<!-- ##### FUNCTION nm_device_olpc_mesh_get_active_channel ##### --> +<!-- ##### FUNCTION nm_device_olpc_mesh_new ##### --> <para> </para> -@device: +@connection: +@path: @Returns: -<!-- ##### FUNCTION nm_device_olpc_mesh_get_companion ##### --> +<!-- ##### FUNCTION nm_device_olpc_mesh_get_hw_address ##### --> <para> </para> @@ -120,7 +121,7 @@ NMDeviceOlpcMesh @Returns: -<!-- ##### FUNCTION nm_device_olpc_mesh_get_hw_address ##### --> +<!-- ##### FUNCTION nm_device_olpc_mesh_get_companion ##### --> <para> </para> @@ -129,13 +130,12 @@ NMDeviceOlpcMesh @Returns: -<!-- ##### FUNCTION nm_device_olpc_mesh_new ##### --> +<!-- ##### FUNCTION nm_device_olpc_mesh_get_active_channel ##### --> <para> </para> -@connection: -@path: +@device: @Returns: diff --git a/docs/libnm-glib/tmpl/nm-device-vlan.sgml b/docs/libnm-glib/tmpl/nm-device-vlan.sgml index 30d839e0..3ac5830f 100644 --- a/docs/libnm-glib/tmpl/nm-device-vlan.sgml +++ b/docs/libnm-glib/tmpl/nm-device-vlan.sgml @@ -22,50 +22,39 @@ NMDeviceVlan <!-- ##### SECTION Image ##### --> -<!-- ##### STRUCT NMDeviceVlan ##### --> +<!-- ##### ENUM NMDeviceVlanError ##### --> <para> </para> +@NM_DEVICE_VLAN_ERROR_UNKNOWN: +@NM_DEVICE_VLAN_ERROR_NOT_VLAN_CONNECTION: +@NM_DEVICE_VLAN_ERROR_INVALID_VLAN_CONNECTION: +@NM_DEVICE_VLAN_ERROR_ID_MISMATCH: +@NM_DEVICE_VLAN_ERROR_INTERFACE_MISMATCH: -<!-- ##### ARG NMDeviceVlan:carrier ##### --> +<!-- ##### MACRO NM_DEVICE_VLAN_ERROR ##### --> <para> </para> -<!-- ##### ARG NMDeviceVlan:hw-address ##### --> -<para> -</para> -<!-- ##### ARG NMDeviceVlan:vlan-id ##### --> +<!-- ##### FUNCTION nm_device_vlan_error_quark ##### --> <para> </para> -<!-- ##### STRUCT NMDeviceVlanClass ##### --> -<para> - -</para> +@void: +@Returns: -@parent: -@_reserved1: -@_reserved2: -@_reserved3: -@_reserved4: -@_reserved5: -@_reserved6: -<!-- ##### ENUM NMDeviceVlanError ##### --> +<!-- ##### MACRO NM_DEVICE_VLAN_HW_ADDRESS ##### --> <para> </para> -@NM_DEVICE_VLAN_ERROR_UNKNOWN: -@NM_DEVICE_VLAN_ERROR_NOT_VLAN_CONNECTION: -@NM_DEVICE_VLAN_ERROR_INVALID_VLAN_CONNECTION: -@NM_DEVICE_VLAN_ERROR_ID_MISMATCH: -@NM_DEVICE_VLAN_ERROR_INTERFACE_MISMATCH: + <!-- ##### MACRO NM_DEVICE_VLAN_CARRIER ##### --> <para> @@ -74,42 +63,54 @@ NMDeviceVlan -<!-- ##### MACRO NM_DEVICE_VLAN_ERROR ##### --> +<!-- ##### MACRO NM_DEVICE_VLAN_VLAN_ID ##### --> <para> </para> -<!-- ##### MACRO NM_DEVICE_VLAN_HW_ADDRESS ##### --> +<!-- ##### STRUCT NMDeviceVlan ##### --> <para> </para> - -<!-- ##### MACRO NM_DEVICE_VLAN_VLAN_ID ##### --> +<!-- ##### ARG NMDeviceVlan:carrier ##### --> <para> </para> +<!-- ##### ARG NMDeviceVlan:hw-address ##### --> +<para> +</para> -<!-- ##### FUNCTION nm_device_vlan_error_quark ##### --> +<!-- ##### ARG NMDeviceVlan:vlan-id ##### --> <para> </para> -@void: -@Returns: +<!-- ##### STRUCT NMDeviceVlanClass ##### --> +<para> +</para> -<!-- ##### FUNCTION nm_device_vlan_get_carrier ##### --> +@parent: +@_reserved1: +@_reserved2: +@_reserved3: +@_reserved4: +@_reserved5: +@_reserved6: + +<!-- ##### FUNCTION nm_device_vlan_new ##### --> <para> </para> -@device: +@connection: +@path: @Returns: @@ -122,7 +123,7 @@ NMDeviceVlan @Returns: -<!-- ##### FUNCTION nm_device_vlan_get_vlan_id ##### --> +<!-- ##### FUNCTION nm_device_vlan_get_carrier ##### --> <para> </para> @@ -131,13 +132,12 @@ NMDeviceVlan @Returns: -<!-- ##### FUNCTION nm_device_vlan_new ##### --> +<!-- ##### FUNCTION nm_device_vlan_get_vlan_id ##### --> <para> </para> -@connection: -@path: +@device: @Returns: diff --git a/docs/libnm-glib/tmpl/nm-device-wifi.sgml b/docs/libnm-glib/tmpl/nm-device-wifi.sgml index 3b5def39..094344b8 100644 --- a/docs/libnm-glib/tmpl/nm-device-wifi.sgml +++ b/docs/libnm-glib/tmpl/nm-device-wifi.sgml @@ -22,165 +22,164 @@ NMDeviceWifi <!-- ##### SECTION Image ##### --> -<!-- ##### STRUCT NMDeviceWifi ##### --> +<!-- ##### ENUM NMDeviceWifiError ##### --> <para> </para> +@NM_DEVICE_WIFI_ERROR_UNKNOWN: +@NM_DEVICE_WIFI_ERROR_NOT_WIFI_CONNECTION: +@NM_DEVICE_WIFI_ERROR_INVALID_WIFI_CONNECTION: +@NM_DEVICE_WIFI_ERROR_INVALID_DEVICE_MAC: +@NM_DEVICE_WIFI_ERROR_MAC_MISMATCH: +@NM_DEVICE_WIFI_ERROR_MISSING_DEVICE_WPA_CAPS: +@NM_DEVICE_WIFI_ERROR_MISSING_DEVICE_RSN_CAPS: -<!-- ##### SIGNAL NMDeviceWifi::access-point-added ##### --> +<!-- ##### MACRO NM_DEVICE_WIFI_ERROR ##### --> <para> </para> -@nmdevicewifi: the object which received the signal. -@arg1: -<!-- ##### SIGNAL NMDeviceWifi::access-point-removed ##### --> + +<!-- ##### FUNCTION nm_device_wifi_error_quark ##### --> <para> </para> -@nmdevicewifi: the object which received the signal. -@arg1: +@void: +@Returns: -<!-- ##### ARG NMDeviceWifi:active-access-point ##### --> + +<!-- ##### MACRO NM_DEVICE_WIFI_HW_ADDRESS ##### --> <para> </para> -<!-- ##### ARG NMDeviceWifi:bitrate ##### --> -<para> -</para> -<!-- ##### ARG NMDeviceWifi:hw-address ##### --> +<!-- ##### MACRO NM_DEVICE_WIFI_PERMANENT_HW_ADDRESS ##### --> <para> </para> -<!-- ##### ARG NMDeviceWifi:mode ##### --> -<para> -</para> -<!-- ##### ARG NMDeviceWifi:perm-hw-address ##### --> +<!-- ##### MACRO NM_DEVICE_WIFI_MODE ##### --> <para> </para> -<!-- ##### ARG NMDeviceWifi:wireless-capabilities ##### --> -<para> -</para> -<!-- ##### STRUCT NMDeviceWifiClass ##### --> +<!-- ##### MACRO NM_DEVICE_WIFI_BITRATE ##### --> <para> </para> -@parent: -@access_point_added: -@access_point_removed: -@_reserved1: -@_reserved2: -@_reserved3: -@_reserved4: -@_reserved5: -@_reserved6: -<!-- ##### ENUM NMDeviceWifiError ##### --> + +<!-- ##### MACRO NM_DEVICE_WIFI_ACTIVE_ACCESS_POINT ##### --> <para> </para> -@NM_DEVICE_WIFI_ERROR_UNKNOWN: -@NM_DEVICE_WIFI_ERROR_NOT_WIFI_CONNECTION: -@NM_DEVICE_WIFI_ERROR_INVALID_WIFI_CONNECTION: -@NM_DEVICE_WIFI_ERROR_INVALID_DEVICE_MAC: -@NM_DEVICE_WIFI_ERROR_MAC_MISMATCH: -@NM_DEVICE_WIFI_ERROR_MISSING_DEVICE_WPA_CAPS: -@NM_DEVICE_WIFI_ERROR_MISSING_DEVICE_RSN_CAPS: -<!-- ##### USER_FUNCTION NMDeviceWifiRequestScanFn ##### --> + +<!-- ##### MACRO NM_DEVICE_WIFI_CAPABILITIES ##### --> <para> </para> -@device: -@error: -@user_data: -<!-- ##### MACRO NM_DEVICE_WIFI_ACTIVE_ACCESS_POINT ##### --> +<!-- ##### STRUCT NMDeviceWifi ##### --> <para> </para> - -<!-- ##### MACRO NM_DEVICE_WIFI_BITRATE ##### --> +<!-- ##### SIGNAL NMDeviceWifi::access-point-added ##### --> <para> </para> +@nmdevicewifi: the object which received the signal. +@arg1: - -<!-- ##### MACRO NM_DEVICE_WIFI_CAPABILITIES ##### --> +<!-- ##### SIGNAL NMDeviceWifi::access-point-removed ##### --> <para> </para> +@nmdevicewifi: the object which received the signal. +@arg1: - -<!-- ##### MACRO NM_DEVICE_WIFI_ERROR ##### --> +<!-- ##### ARG NMDeviceWifi:active-access-point ##### --> <para> </para> +<!-- ##### ARG NMDeviceWifi:bitrate ##### --> +<para> +</para> -<!-- ##### MACRO NM_DEVICE_WIFI_HW_ADDRESS ##### --> +<!-- ##### ARG NMDeviceWifi:hw-address ##### --> <para> </para> +<!-- ##### ARG NMDeviceWifi:mode ##### --> +<para> +</para> -<!-- ##### MACRO NM_DEVICE_WIFI_MODE ##### --> +<!-- ##### ARG NMDeviceWifi:perm-hw-address ##### --> <para> </para> +<!-- ##### ARG NMDeviceWifi:wireless-capabilities ##### --> +<para> +</para> -<!-- ##### MACRO NM_DEVICE_WIFI_PERMANENT_HW_ADDRESS ##### --> +<!-- ##### STRUCT NMDeviceWifiClass ##### --> <para> </para> +@parent: +@access_point_added: +@access_point_removed: +@_reserved1: +@_reserved2: +@_reserved3: +@_reserved4: +@_reserved5: +@_reserved6: - -<!-- ##### FUNCTION nm_device_wifi_error_quark ##### --> +<!-- ##### FUNCTION nm_device_wifi_new ##### --> <para> </para> -@void: +@connection: +@path: @Returns: -<!-- ##### FUNCTION nm_device_wifi_get_access_point_by_path ##### --> +<!-- ##### FUNCTION nm_device_wifi_get_hw_address ##### --> <para> </para> @device: -@path: @Returns: -<!-- ##### FUNCTION nm_device_wifi_get_access_points ##### --> +<!-- ##### FUNCTION nm_device_wifi_get_permanent_hw_address ##### --> <para> </para> @@ -189,7 +188,7 @@ NMDeviceWifi @Returns: -<!-- ##### FUNCTION nm_device_wifi_get_active_access_point ##### --> +<!-- ##### FUNCTION nm_device_wifi_get_mode ##### --> <para> </para> @@ -216,7 +215,7 @@ NMDeviceWifi @Returns: -<!-- ##### FUNCTION nm_device_wifi_get_hw_address ##### --> +<!-- ##### FUNCTION nm_device_wifi_get_active_access_point ##### --> <para> </para> @@ -225,16 +224,17 @@ NMDeviceWifi @Returns: -<!-- ##### FUNCTION nm_device_wifi_get_mode ##### --> +<!-- ##### FUNCTION nm_device_wifi_get_access_point_by_path ##### --> <para> </para> @device: +@path: @Returns: -<!-- ##### FUNCTION nm_device_wifi_get_permanent_hw_address ##### --> +<!-- ##### FUNCTION nm_device_wifi_get_access_points ##### --> <para> </para> @@ -243,14 +243,14 @@ NMDeviceWifi @Returns: -<!-- ##### FUNCTION nm_device_wifi_new ##### --> +<!-- ##### USER_FUNCTION NMDeviceWifiRequestScanFn ##### --> <para> </para> -@connection: -@path: -@Returns: +@device: +@error: +@user_data: <!-- ##### FUNCTION nm_device_wifi_request_scan_simple ##### --> diff --git a/docs/libnm-glib/tmpl/nm-device-wimax.sgml b/docs/libnm-glib/tmpl/nm-device-wimax.sgml index d23d0231..23d89281 100644 --- a/docs/libnm-glib/tmpl/nm-device-wimax.sgml +++ b/docs/libnm-glib/tmpl/nm-device-wimax.sgml @@ -22,84 +22,69 @@ NMDeviceWimax <!-- ##### SECTION Image ##### --> -<!-- ##### STRUCT NMDeviceWimax ##### --> +<!-- ##### ENUM NMDeviceWimaxError ##### --> <para> </para> +@NM_DEVICE_WIMAX_ERROR_UNKNOWN: +@NM_DEVICE_WIMAX_ERROR_NOT_WIMAX_CONNECTION: +@NM_DEVICE_WIMAX_ERROR_INVALID_WIMAX_CONNECTION: +@NM_DEVICE_WIMAX_ERROR_INVALID_DEVICE_MAC: +@NM_DEVICE_WIMAX_ERROR_MAC_MISMATCH: -<!-- ##### SIGNAL NMDeviceWimax::nsp-added ##### --> +<!-- ##### MACRO NM_DEVICE_WIMAX_ERROR ##### --> <para> </para> -@nmdevicewimax: the object which received the signal. -@arg1: -<!-- ##### SIGNAL NMDeviceWimax::nsp-removed ##### --> + +<!-- ##### FUNCTION nm_device_wimax_error_quark ##### --> <para> </para> -@nmdevicewimax: the object which received the signal. -@arg1: - -<!-- ##### ARG NMDeviceWimax:active-nsp ##### --> -<para> +@void: +@Returns: -</para> -<!-- ##### ARG NMDeviceWimax:bsid ##### --> +<!-- ##### MACRO NM_DEVICE_WIMAX_HW_ADDRESS ##### --> <para> </para> -<!-- ##### ARG NMDeviceWimax:center-frequency ##### --> -<para> -</para> -<!-- ##### ARG NMDeviceWimax:cinr ##### --> +<!-- ##### MACRO NM_DEVICE_WIMAX_ACTIVE_NSP ##### --> <para> </para> -<!-- ##### ARG NMDeviceWimax:hw-address ##### --> -<para> -</para> -<!-- ##### ARG NMDeviceWimax:rssi ##### --> +<!-- ##### MACRO NM_DEVICE_WIMAX_CENTER_FREQUENCY ##### --> <para> </para> -<!-- ##### ARG NMDeviceWimax:tx-power ##### --> -<para> -</para> -<!-- ##### STRUCT NMDeviceWimaxClass ##### --> +<!-- ##### MACRO NM_DEVICE_WIMAX_RSSI ##### --> <para> </para> -@parent: -@nsp_added: -@nsp_removed: -<!-- ##### ENUM NMDeviceWimaxError ##### --> + +<!-- ##### MACRO NM_DEVICE_WIMAX_CINR ##### --> <para> </para> -@NM_DEVICE_WIMAX_ERROR_UNKNOWN: -@NM_DEVICE_WIMAX_ERROR_NOT_WIMAX_CONNECTION: -@NM_DEVICE_WIMAX_ERROR_INVALID_WIMAX_CONNECTION: -@NM_DEVICE_WIMAX_ERROR_INVALID_DEVICE_MAC: -@NM_DEVICE_WIMAX_ERROR_MAC_MISMATCH: -<!-- ##### MACRO NM_DEVICE_WIMAX_ACTIVE_NSP ##### --> + +<!-- ##### MACRO NM_DEVICE_WIMAX_TX_POWER ##### --> <para> </para> @@ -113,94 +98,111 @@ NMDeviceWimax -<!-- ##### MACRO NM_DEVICE_WIMAX_CENTER_FREQUENCY ##### --> +<!-- ##### STRUCT NMDeviceWimax ##### --> <para> </para> - -<!-- ##### MACRO NM_DEVICE_WIMAX_CINR ##### --> +<!-- ##### SIGNAL NMDeviceWimax::nsp-added ##### --> <para> </para> +@nmdevicewimax: the object which received the signal. +@arg1: - -<!-- ##### MACRO NM_DEVICE_WIMAX_ERROR ##### --> +<!-- ##### SIGNAL NMDeviceWimax::nsp-removed ##### --> <para> </para> +@nmdevicewimax: the object which received the signal. +@arg1: - -<!-- ##### MACRO NM_DEVICE_WIMAX_HW_ADDRESS ##### --> +<!-- ##### ARG NMDeviceWimax:active-nsp ##### --> <para> </para> +<!-- ##### ARG NMDeviceWimax:bsid ##### --> +<para> +</para> -<!-- ##### MACRO NM_DEVICE_WIMAX_RSSI ##### --> +<!-- ##### ARG NMDeviceWimax:center-frequency ##### --> <para> </para> +<!-- ##### ARG NMDeviceWimax:cinr ##### --> +<para> +</para> -<!-- ##### MACRO NM_DEVICE_WIMAX_TX_POWER ##### --> +<!-- ##### ARG NMDeviceWimax:hw-address ##### --> <para> </para> +<!-- ##### ARG NMDeviceWimax:rssi ##### --> +<para> +</para> -<!-- ##### FUNCTION nm_device_wimax_error_quark ##### --> +<!-- ##### ARG NMDeviceWimax:tx-power ##### --> <para> </para> -@void: -@Returns: +<!-- ##### STRUCT NMDeviceWimaxClass ##### --> +<para> + +</para> +@parent: +@nsp_added: +@nsp_removed: -<!-- ##### FUNCTION nm_device_wimax_get_active_nsp ##### --> +<!-- ##### FUNCTION nm_device_wimax_new ##### --> <para> </para> -@wimax: +@connection: +@path: @Returns: -<!-- ##### FUNCTION nm_device_wimax_get_bsid ##### --> +<!-- ##### FUNCTION nm_device_wimax_get_hw_address ##### --> <para> </para> -@self: +@wimax: @Returns: -<!-- ##### FUNCTION nm_device_wimax_get_center_frequency ##### --> +<!-- ##### FUNCTION nm_device_wimax_get_active_nsp ##### --> <para> </para> -@self: +@wimax: @Returns: -<!-- ##### FUNCTION nm_device_wimax_get_cinr ##### --> +<!-- ##### FUNCTION nm_device_wimax_get_nsp_by_path ##### --> <para> </para> -@self: +@wimax: +@path: @Returns: -<!-- ##### FUNCTION nm_device_wimax_get_hw_address ##### --> +<!-- ##### FUNCTION nm_device_wimax_get_nsps ##### --> <para> </para> @@ -209,26 +211,25 @@ NMDeviceWimax @Returns: -<!-- ##### FUNCTION nm_device_wimax_get_nsp_by_path ##### --> +<!-- ##### FUNCTION nm_device_wimax_get_center_frequency ##### --> <para> </para> -@wimax: -@path: +@self: @Returns: -<!-- ##### FUNCTION nm_device_wimax_get_nsps ##### --> +<!-- ##### FUNCTION nm_device_wimax_get_rssi ##### --> <para> </para> -@wimax: +@self: @Returns: -<!-- ##### FUNCTION nm_device_wimax_get_rssi ##### --> +<!-- ##### FUNCTION nm_device_wimax_get_cinr ##### --> <para> </para> @@ -246,13 +247,12 @@ NMDeviceWimax @Returns: -<!-- ##### FUNCTION nm_device_wimax_new ##### --> +<!-- ##### FUNCTION nm_device_wimax_get_bsid ##### --> <para> </para> -@connection: -@path: +@self: @Returns: diff --git a/docs/libnm-glib/tmpl/nm-device.sgml b/docs/libnm-glib/tmpl/nm-device.sgml index d61ff355..7d783dc0 100644 --- a/docs/libnm-glib/tmpl/nm-device.sgml +++ b/docs/libnm-glib/tmpl/nm-device.sgml @@ -22,341 +22,336 @@ NMDevice <!-- ##### SECTION Image ##### --> -<!-- ##### STRUCT NMDevice ##### --> +<!-- ##### MACRO NM_DEVICE_DEVICE_TYPE ##### --> <para> </para> -<!-- ##### SIGNAL NMDevice::state-changed ##### --> + +<!-- ##### MACRO NM_DEVICE_UDI ##### --> <para> </para> -@nmdevice: the object which received the signal. -@arg1: -@arg2: -@arg3: - -<!-- ##### ARG NMDevice:active-connection ##### --> -<para> -</para> -<!-- ##### ARG NMDevice:autoconnect ##### --> +<!-- ##### MACRO NM_DEVICE_INTERFACE ##### --> <para> </para> -<!-- ##### ARG NMDevice:available-connections ##### --> -<para> -</para> -<!-- ##### ARG NMDevice:capabilities ##### --> +<!-- ##### MACRO NM_DEVICE_IP_INTERFACE ##### --> <para> </para> -<!-- ##### ARG NMDevice:device-type ##### --> -<para> -</para> -<!-- ##### ARG NMDevice:dhcp4-config ##### --> +<!-- ##### MACRO NM_DEVICE_DRIVER ##### --> <para> </para> -<!-- ##### ARG NMDevice:dhcp6-config ##### --> -<para> -</para> -<!-- ##### ARG NMDevice:driver ##### --> +<!-- ##### MACRO NM_DEVICE_DRIVER_VERSION ##### --> <para> </para> -<!-- ##### ARG NMDevice:driver-version ##### --> -<para> -</para> -<!-- ##### ARG NMDevice:firmware-missing ##### --> +<!-- ##### MACRO NM_DEVICE_FIRMWARE_VERSION ##### --> <para> </para> -<!-- ##### ARG NMDevice:firmware-version ##### --> -<para> -</para> -<!-- ##### ARG NMDevice:interface ##### --> +<!-- ##### MACRO NM_DEVICE_CAPABILITIES ##### --> <para> </para> -<!-- ##### ARG NMDevice:ip-interface ##### --> -<para> -</para> -<!-- ##### ARG NMDevice:ip4-config ##### --> +<!-- ##### MACRO NM_DEVICE_MANAGED ##### --> <para> </para> -<!-- ##### ARG NMDevice:ip6-config ##### --> -<para> -</para> -<!-- ##### ARG NMDevice:managed ##### --> +<!-- ##### MACRO NM_DEVICE_AUTOCONNECT ##### --> <para> </para> -<!-- ##### ARG NMDevice:product ##### --> -<para> -</para> -<!-- ##### ARG NMDevice:state ##### --> +<!-- ##### MACRO NM_DEVICE_FIRMWARE_MISSING ##### --> <para> </para> -<!-- ##### ARG NMDevice:state-reason ##### --> -<para> -</para> -<!-- ##### ARG NMDevice:udi ##### --> +<!-- ##### MACRO NM_DEVICE_IP4_CONFIG ##### --> <para> </para> -<!-- ##### ARG NMDevice:vendor ##### --> -<para> -</para> -<!-- ##### STRUCT NMDeviceClass ##### --> +<!-- ##### MACRO NM_DEVICE_DHCP4_CONFIG ##### --> <para> </para> -@parent: -@state_changed: -@connection_compatible: -@_reserved1: -@_reserved2: -@_reserved3: -@_reserved4: -@_reserved5: -@_reserved6: -<!-- ##### USER_FUNCTION NMDeviceDeactivateFn ##### --> + +<!-- ##### MACRO NM_DEVICE_IP6_CONFIG ##### --> <para> </para> -@device: -@error: -@user_data: -<!-- ##### MACRO NM_DEVICE_ACTIVE_CONNECTION ##### --> +<!-- ##### MACRO NM_DEVICE_DHCP6_CONFIG ##### --> <para> </para> -<!-- ##### MACRO NM_DEVICE_AUTOCONNECT ##### --> +<!-- ##### MACRO NM_DEVICE_STATE ##### --> <para> </para> -<!-- ##### MACRO NM_DEVICE_AVAILABLE_CONNECTIONS ##### --> +<!-- ##### MACRO NM_DEVICE_STATE_REASON ##### --> <para> </para> -<!-- ##### MACRO NM_DEVICE_CAPABILITIES ##### --> +<!-- ##### MACRO NM_DEVICE_ACTIVE_CONNECTION ##### --> <para> </para> -<!-- ##### MACRO NM_DEVICE_DEVICE_TYPE ##### --> +<!-- ##### MACRO NM_DEVICE_AVAILABLE_CONNECTIONS ##### --> <para> </para> -<!-- ##### MACRO NM_DEVICE_DHCP4_CONFIG ##### --> +<!-- ##### MACRO NM_DEVICE_VENDOR ##### --> <para> </para> -<!-- ##### MACRO NM_DEVICE_DHCP6_CONFIG ##### --> +<!-- ##### MACRO NM_DEVICE_PRODUCT ##### --> <para> </para> -<!-- ##### MACRO NM_DEVICE_DRIVER ##### --> +<!-- ##### STRUCT NMDevice ##### --> <para> </para> - -<!-- ##### MACRO NM_DEVICE_DRIVER_VERSION ##### --> +<!-- ##### SIGNAL NMDevice::state-changed ##### --> <para> </para> +@nmdevice: the object which received the signal. +@arg1: +@arg2: +@arg3: - -<!-- ##### MACRO NM_DEVICE_FIRMWARE_MISSING ##### --> +<!-- ##### ARG NMDevice:active-connection ##### --> <para> </para> +<!-- ##### ARG NMDevice:autoconnect ##### --> +<para> +</para> -<!-- ##### MACRO NM_DEVICE_FIRMWARE_VERSION ##### --> +<!-- ##### ARG NMDevice:available-connections ##### --> <para> </para> +<!-- ##### ARG NMDevice:capabilities ##### --> +<para> +</para> -<!-- ##### MACRO NM_DEVICE_INTERFACE ##### --> +<!-- ##### ARG NMDevice:device-type ##### --> <para> </para> +<!-- ##### ARG NMDevice:dhcp4-config ##### --> +<para> +</para> -<!-- ##### MACRO NM_DEVICE_IP4_CONFIG ##### --> +<!-- ##### ARG NMDevice:dhcp6-config ##### --> <para> </para> +<!-- ##### ARG NMDevice:driver ##### --> +<para> +</para> -<!-- ##### MACRO NM_DEVICE_IP6_CONFIG ##### --> +<!-- ##### ARG NMDevice:driver-version ##### --> <para> </para> +<!-- ##### ARG NMDevice:firmware-missing ##### --> +<para> +</para> -<!-- ##### MACRO NM_DEVICE_IP_INTERFACE ##### --> +<!-- ##### ARG NMDevice:firmware-version ##### --> <para> </para> +<!-- ##### ARG NMDevice:interface ##### --> +<para> +</para> -<!-- ##### MACRO NM_DEVICE_MANAGED ##### --> +<!-- ##### ARG NMDevice:ip-interface ##### --> <para> </para> +<!-- ##### ARG NMDevice:ip4-config ##### --> +<para> +</para> -<!-- ##### MACRO NM_DEVICE_PRODUCT ##### --> +<!-- ##### ARG NMDevice:ip6-config ##### --> <para> </para> +<!-- ##### ARG NMDevice:managed ##### --> +<para> +</para> -<!-- ##### MACRO NM_DEVICE_STATE ##### --> +<!-- ##### ARG NMDevice:product ##### --> <para> </para> +<!-- ##### ARG NMDevice:state ##### --> +<para> +</para> -<!-- ##### MACRO NM_DEVICE_STATE_REASON ##### --> +<!-- ##### ARG NMDevice:state-reason ##### --> <para> </para> +<!-- ##### ARG NMDevice:udi ##### --> +<para> +</para> -<!-- ##### MACRO NM_DEVICE_UDI ##### --> +<!-- ##### ARG NMDevice:vendor ##### --> <para> </para> +<!-- ##### STRUCT NMDeviceClass ##### --> +<para> +</para> -<!-- ##### MACRO NM_DEVICE_VENDOR ##### --> +@parent: +@state_changed: +@connection_compatible: +@_reserved1: +@_reserved2: +@_reserved3: +@_reserved4: +@_reserved5: +@_reserved6: + +<!-- ##### FUNCTION nm_device_new ##### --> <para> </para> +@connection: +@path: +@Returns: -<!-- ##### FUNCTION nm_device_connection_compatible ##### --> +<!-- ##### FUNCTION nm_device_get_iface ##### --> <para> </para> @device: -@connection: -@error: @Returns: -<!-- ##### FUNCTION nm_device_connection_valid ##### --> +<!-- ##### FUNCTION nm_device_get_ip_iface ##### --> <para> </para> @device: -@connection: @Returns: -<!-- ##### FUNCTION nm_device_disconnect ##### --> +<!-- ##### FUNCTION nm_device_get_device_type ##### --> <para> </para> @device: -@callback: -@user_data: +@Returns: -<!-- ##### FUNCTION nm_device_filter_connections ##### --> +<!-- ##### FUNCTION nm_device_get_udi ##### --> <para> </para> @device: -@connections: @Returns: -<!-- ##### FUNCTION nm_device_get_active_connection ##### --> +<!-- ##### FUNCTION nm_device_get_driver ##### --> <para> </para> @@ -365,7 +360,7 @@ NMDevice @Returns: -<!-- ##### FUNCTION nm_device_get_autoconnect ##### --> +<!-- ##### FUNCTION nm_device_get_driver_version ##### --> <para> </para> @@ -374,7 +369,7 @@ NMDevice @Returns: -<!-- ##### FUNCTION nm_device_get_available_connections ##### --> +<!-- ##### FUNCTION nm_device_get_firmware_version ##### --> <para> </para> @@ -392,7 +387,7 @@ NMDevice @Returns: -<!-- ##### FUNCTION nm_device_get_device_type ##### --> +<!-- ##### FUNCTION nm_device_get_managed ##### --> <para> </para> @@ -401,7 +396,7 @@ NMDevice @Returns: -<!-- ##### FUNCTION nm_device_get_dhcp4_config ##### --> +<!-- ##### FUNCTION nm_device_get_autoconnect ##### --> <para> </para> @@ -410,16 +405,16 @@ NMDevice @Returns: -<!-- ##### FUNCTION nm_device_get_dhcp6_config ##### --> +<!-- ##### FUNCTION nm_device_set_autoconnect ##### --> <para> </para> @device: -@Returns: +@autoconnect: -<!-- ##### FUNCTION nm_device_get_driver ##### --> +<!-- ##### FUNCTION nm_device_get_firmware_missing ##### --> <para> </para> @@ -428,7 +423,7 @@ NMDevice @Returns: -<!-- ##### FUNCTION nm_device_get_driver_version ##### --> +<!-- ##### FUNCTION nm_device_get_ip4_config ##### --> <para> </para> @@ -437,7 +432,7 @@ NMDevice @Returns: -<!-- ##### FUNCTION nm_device_get_firmware_missing ##### --> +<!-- ##### FUNCTION nm_device_get_dhcp4_config ##### --> <para> </para> @@ -446,7 +441,7 @@ NMDevice @Returns: -<!-- ##### FUNCTION nm_device_get_firmware_version ##### --> +<!-- ##### FUNCTION nm_device_get_ip6_config ##### --> <para> </para> @@ -455,7 +450,7 @@ NMDevice @Returns: -<!-- ##### FUNCTION nm_device_get_iface ##### --> +<!-- ##### FUNCTION nm_device_get_dhcp6_config ##### --> <para> </para> @@ -464,7 +459,7 @@ NMDevice @Returns: -<!-- ##### FUNCTION nm_device_get_ip4_config ##### --> +<!-- ##### FUNCTION nm_device_get_state ##### --> <para> </para> @@ -473,16 +468,17 @@ NMDevice @Returns: -<!-- ##### FUNCTION nm_device_get_ip6_config ##### --> +<!-- ##### FUNCTION nm_device_get_state_reason ##### --> <para> </para> @device: +@reason: @Returns: -<!-- ##### FUNCTION nm_device_get_ip_iface ##### --> +<!-- ##### FUNCTION nm_device_get_active_connection ##### --> <para> </para> @@ -491,7 +487,7 @@ NMDevice @Returns: -<!-- ##### FUNCTION nm_device_get_managed ##### --> +<!-- ##### FUNCTION nm_device_get_available_connections ##### --> <para> </para> @@ -509,7 +505,7 @@ NMDevice @Returns: -<!-- ##### FUNCTION nm_device_get_state ##### --> +<!-- ##### FUNCTION nm_device_get_vendor ##### --> <para> </para> @@ -518,50 +514,54 @@ NMDevice @Returns: -<!-- ##### FUNCTION nm_device_get_state_reason ##### --> +<!-- ##### USER_FUNCTION NMDeviceDeactivateFn ##### --> <para> </para> @device: -@reason: -@Returns: +@error: +@user_data: -<!-- ##### FUNCTION nm_device_get_udi ##### --> +<!-- ##### FUNCTION nm_device_disconnect ##### --> <para> </para> @device: -@Returns: +@callback: +@user_data: -<!-- ##### FUNCTION nm_device_get_vendor ##### --> +<!-- ##### FUNCTION nm_device_filter_connections ##### --> <para> </para> @device: +@connections: @Returns: -<!-- ##### FUNCTION nm_device_new ##### --> +<!-- ##### FUNCTION nm_device_connection_valid ##### --> <para> </para> +@device: @connection: -@path: @Returns: -<!-- ##### FUNCTION nm_device_set_autoconnect ##### --> +<!-- ##### FUNCTION nm_device_connection_compatible ##### --> <para> </para> @device: -@autoconnect: +@connection: +@error: +@Returns: diff --git a/docs/libnm-glib/tmpl/nm-dhcp4-config.sgml b/docs/libnm-glib/tmpl/nm-dhcp4-config.sgml index cef5854d..35a6e306 100644 --- a/docs/libnm-glib/tmpl/nm-dhcp4-config.sgml +++ b/docs/libnm-glib/tmpl/nm-dhcp4-config.sgml @@ -53,13 +53,13 @@ NMDHCP4Config -<!-- ##### FUNCTION nm_dhcp4_config_get_one_option ##### --> +<!-- ##### FUNCTION nm_dhcp4_config_new ##### --> <para> </para> -@config: -@option: +@connection: +@object_path: @Returns: @@ -72,13 +72,13 @@ NMDHCP4Config @Returns: -<!-- ##### FUNCTION nm_dhcp4_config_new ##### --> +<!-- ##### FUNCTION nm_dhcp4_config_get_one_option ##### --> <para> </para> -@connection: -@object_path: +@config: +@option: @Returns: diff --git a/docs/libnm-glib/tmpl/nm-dhcp6-config.sgml b/docs/libnm-glib/tmpl/nm-dhcp6-config.sgml index 2c113261..3e00467c 100644 --- a/docs/libnm-glib/tmpl/nm-dhcp6-config.sgml +++ b/docs/libnm-glib/tmpl/nm-dhcp6-config.sgml @@ -53,13 +53,13 @@ NMDHCP6Config -<!-- ##### FUNCTION nm_dhcp6_config_get_one_option ##### --> +<!-- ##### FUNCTION nm_dhcp6_config_new ##### --> <para> </para> -@config: -@option: +@connection: +@object_path: @Returns: @@ -72,13 +72,13 @@ NMDHCP6Config @Returns: -<!-- ##### FUNCTION nm_dhcp6_config_new ##### --> +<!-- ##### FUNCTION nm_dhcp6_config_get_one_option ##### --> <para> </para> -@connection: -@object_path: +@config: +@option: @Returns: diff --git a/docs/libnm-glib/tmpl/nm-glib-marshal.sgml b/docs/libnm-glib/tmpl/nm-glib-marshal.sgml deleted file mode 100644 index 2f3b0280..00000000 --- a/docs/libnm-glib/tmpl/nm-glib-marshal.sgml +++ /dev/null @@ -1,24 +0,0 @@ -<!-- ##### SECTION Title ##### --> -nm-glib-marshal - -<!-- ##### SECTION Short_Description ##### --> - - -<!-- ##### SECTION Long_Description ##### --> -<para> - -</para> - - -<!-- ##### SECTION See_Also ##### --> -<para> - -</para> - - -<!-- ##### SECTION Stability_Level ##### --> - - -<!-- ##### SECTION Image ##### --> - - diff --git a/docs/libnm-glib/tmpl/nm-ip4-config.sgml b/docs/libnm-glib/tmpl/nm-ip4-config.sgml index e015c2af..08b6bcbd 100644 --- a/docs/libnm-glib/tmpl/nm-ip4-config.sgml +++ b/docs/libnm-glib/tmpl/nm-ip4-config.sgml @@ -73,14 +73,14 @@ NMIP4Config -<!-- ##### MACRO NM_IP4_CONFIG_DOMAINS ##### --> +<!-- ##### MACRO NM_IP4_CONFIG_NAMESERVERS ##### --> <para> </para> -<!-- ##### MACRO NM_IP4_CONFIG_NAMESERVERS ##### --> +<!-- ##### MACRO NM_IP4_CONFIG_DOMAINS ##### --> <para> </para> @@ -101,16 +101,17 @@ NMIP4Config -<!-- ##### FUNCTION nm_ip4_config_get_addresses ##### --> +<!-- ##### FUNCTION nm_ip4_config_new ##### --> <para> </para> -@config: +@connection: +@object_path: @Returns: -<!-- ##### FUNCTION nm_ip4_config_get_domains ##### --> +<!-- ##### FUNCTION nm_ip4_config_get_addresses ##### --> <para> </para> @@ -128,7 +129,7 @@ NMIP4Config @Returns: -<!-- ##### FUNCTION nm_ip4_config_get_routes ##### --> +<!-- ##### FUNCTION nm_ip4_config_get_domains ##### --> <para> </para> @@ -137,7 +138,7 @@ NMIP4Config @Returns: -<!-- ##### FUNCTION nm_ip4_config_get_wins_servers ##### --> +<!-- ##### FUNCTION nm_ip4_config_get_routes ##### --> <para> </para> @@ -146,13 +147,12 @@ NMIP4Config @Returns: -<!-- ##### FUNCTION nm_ip4_config_new ##### --> +<!-- ##### FUNCTION nm_ip4_config_get_wins_servers ##### --> <para> </para> -@connection: -@object_path: +@config: @Returns: diff --git a/docs/libnm-glib/tmpl/nm-ip6-config.sgml b/docs/libnm-glib/tmpl/nm-ip6-config.sgml index f098e022..a9c44abd 100644 --- a/docs/libnm-glib/tmpl/nm-ip6-config.sgml +++ b/docs/libnm-glib/tmpl/nm-ip6-config.sgml @@ -68,14 +68,14 @@ NMIP6Config -<!-- ##### MACRO NM_IP6_CONFIG_DOMAINS ##### --> +<!-- ##### MACRO NM_IP6_CONFIG_NAMESERVERS ##### --> <para> </para> -<!-- ##### MACRO NM_IP6_CONFIG_NAMESERVERS ##### --> +<!-- ##### MACRO NM_IP6_CONFIG_DOMAINS ##### --> <para> </para> @@ -89,16 +89,17 @@ NMIP6Config -<!-- ##### FUNCTION nm_ip6_config_get_addresses ##### --> +<!-- ##### FUNCTION nm_ip6_config_new ##### --> <para> </para> -@config: +@connection: +@object_path: @Returns: -<!-- ##### FUNCTION nm_ip6_config_get_domains ##### --> +<!-- ##### FUNCTION nm_ip6_config_get_addresses ##### --> <para> </para> @@ -116,7 +117,7 @@ NMIP6Config @Returns: -<!-- ##### FUNCTION nm_ip6_config_get_routes ##### --> +<!-- ##### FUNCTION nm_ip6_config_get_domains ##### --> <para> </para> @@ -125,13 +126,12 @@ NMIP6Config @Returns: -<!-- ##### FUNCTION nm_ip6_config_new ##### --> +<!-- ##### FUNCTION nm_ip6_config_get_routes ##### --> <para> </para> -@connection: -@object_path: +@config: @Returns: diff --git a/docs/libnm-glib/tmpl/nm-object.sgml b/docs/libnm-glib/tmpl/nm-object.sgml index 93b2441e..bb17ec37 100644 --- a/docs/libnm-glib/tmpl/nm-object.sgml +++ b/docs/libnm-glib/tmpl/nm-object.sgml @@ -22,82 +22,82 @@ NMObject <!-- ##### SECTION Image ##### --> -<!-- ##### STRUCT NMObject ##### --> +<!-- ##### ENUM NMObjectError ##### --> <para> </para> +@NM_OBJECT_ERROR_UNKNOWN: +@NM_OBJECT_ERROR_OBJECT_CREATION_FAILURE: -<!-- ##### SIGNAL NMObject::object-creation-failed ##### --> +<!-- ##### MACRO NM_OBJECT_ERROR ##### --> <para> </para> -@nmobject: the object which received the signal. -@arg1: -@arg2: -<!-- ##### ARG NMObject:dbus-connection ##### --> + +<!-- ##### FUNCTION nm_object_error_quark ##### --> <para> </para> -<!-- ##### ARG NMObject:dbus-path ##### --> -<para> +@void: +@Returns: -</para> -<!-- ##### STRUCT NMObjectClass ##### --> +<!-- ##### MACRO NM_OBJECT_DBUS_CONNECTION ##### --> <para> </para> -@parent: -@object_creation_failed: -@_reserved1: -@_reserved2: -@_reserved3: -@_reserved4: -@_reserved5: -@_reserved6: -<!-- ##### ENUM NMObjectError ##### --> + +<!-- ##### MACRO NM_OBJECT_DBUS_PATH ##### --> <para> </para> -@NM_OBJECT_ERROR_UNKNOWN: -@NM_OBJECT_ERROR_OBJECT_CREATION_FAILURE: -<!-- ##### MACRO NM_OBJECT_DBUS_CONNECTION ##### --> + +<!-- ##### STRUCT NMObject ##### --> <para> </para> - -<!-- ##### MACRO NM_OBJECT_DBUS_PATH ##### --> +<!-- ##### SIGNAL NMObject::object-creation-failed ##### --> <para> </para> +@nmobject: the object which received the signal. +@arg1: +@arg2: - -<!-- ##### MACRO NM_OBJECT_ERROR ##### --> +<!-- ##### ARG NMObject:dbus-connection ##### --> <para> </para> +<!-- ##### ARG NMObject:dbus-path ##### --> +<para> +</para> -<!-- ##### FUNCTION nm_object_error_quark ##### --> +<!-- ##### STRUCT NMObjectClass ##### --> <para> </para> -@void: -@Returns: - +@parent: +@object_creation_failed: +@_reserved1: +@_reserved2: +@_reserved3: +@_reserved4: +@_reserved5: +@_reserved6: <!-- ##### FUNCTION nm_object_get_connection ##### --> <para> diff --git a/docs/libnm-glib/tmpl/nm-remote-connection.sgml b/docs/libnm-glib/tmpl/nm-remote-connection.sgml index 298d7b91..e8314074 100644 --- a/docs/libnm-glib/tmpl/nm-remote-connection.sgml +++ b/docs/libnm-glib/tmpl/nm-remote-connection.sgml @@ -22,6 +22,20 @@ NMRemoteConnection <!-- ##### SECTION Image ##### --> +<!-- ##### MACRO NM_REMOTE_CONNECTION_UPDATED ##### --> +<para> + +</para> + + + +<!-- ##### MACRO NM_REMOTE_CONNECTION_REMOVED ##### --> +<para> + +</para> + + + <!-- ##### STRUCT NMRemoteConnection ##### --> <para> @@ -111,18 +125,14 @@ NMRemoteConnection @user_data: -<!-- ##### MACRO NM_REMOTE_CONNECTION_REMOVED ##### --> -<para> - -</para> - - - -<!-- ##### MACRO NM_REMOTE_CONNECTION_UPDATED ##### --> +<!-- ##### FUNCTION nm_remote_connection_new ##### --> <para> </para> +@bus: +@path: +@Returns: <!-- ##### FUNCTION nm_remote_connection_commit_changes ##### --> @@ -156,13 +166,3 @@ NMRemoteConnection @user_data: -<!-- ##### FUNCTION nm_remote_connection_new ##### --> -<para> - -</para> - -@bus: -@path: -@Returns: - - diff --git a/docs/libnm-glib/tmpl/nm-remote-settings.sgml b/docs/libnm-glib/tmpl/nm-remote-settings.sgml index 44b4d4fb..6471c98c 100644 --- a/docs/libnm-glib/tmpl/nm-remote-settings.sgml +++ b/docs/libnm-glib/tmpl/nm-remote-settings.sgml @@ -22,218 +22,218 @@ NMRemoteSettings <!-- ##### SECTION Image ##### --> -<!-- ##### STRUCT NMRemoteSettings ##### --> +<!-- ##### ENUM NMRemoteSettingsError ##### --> <para> </para> +@NM_REMOTE_SETTINGS_ERROR_UNKNOWN: +@NM_REMOTE_SETTINGS_ERROR_CONNECTION_REMOVED: +@NM_REMOTE_SETTINGS_ERROR_CONNECTION_UNAVAILABLE: -<!-- ##### SIGNAL NMRemoteSettings::connections-read ##### --> +<!-- ##### MACRO NM_REMOTE_SETTINGS_ERROR ##### --> <para> </para> -@nmremotesettings: the object which received the signal. -<!-- ##### SIGNAL NMRemoteSettings::new-connection ##### --> + +<!-- ##### FUNCTION nm_remote_settings_error_quark ##### --> <para> </para> -@nmremotesettings: the object which received the signal. -@arg1: +@void: +@Returns: -<!-- ##### ARG NMRemoteSettings:bus ##### --> + +<!-- ##### MACRO NM_REMOTE_SETTINGS_BUS ##### --> <para> </para> -<!-- ##### ARG NMRemoteSettings:can-modify ##### --> -<para> -</para> -<!-- ##### ARG NMRemoteSettings:hostname ##### --> +<!-- ##### MACRO NM_REMOTE_SETTINGS_SERVICE_RUNNING ##### --> <para> </para> -<!-- ##### ARG NMRemoteSettings:service-running ##### --> + + +<!-- ##### MACRO NM_REMOTE_SETTINGS_HOSTNAME ##### --> <para> </para> -<!-- ##### USER_FUNCTION NMRemoteSettingsAddConnectionFunc ##### --> + + +<!-- ##### MACRO NM_REMOTE_SETTINGS_CAN_MODIFY ##### --> <para> </para> -@settings: -@connection: -@error: -@user_data: -<!-- ##### STRUCT NMRemoteSettingsClass ##### --> +<!-- ##### MACRO NM_REMOTE_SETTINGS_NEW_CONNECTION ##### --> <para> </para> -@parent: -@new_connection: -@connections_read: -@_reserved1: -@_reserved2: -@_reserved3: -@_reserved4: -@_reserved5: -@_reserved6: -<!-- ##### ENUM NMRemoteSettingsError ##### --> + +<!-- ##### MACRO NM_REMOTE_SETTINGS_CONNECTIONS_READ ##### --> <para> </para> -@NM_REMOTE_SETTINGS_ERROR_UNKNOWN: -@NM_REMOTE_SETTINGS_ERROR_CONNECTION_REMOVED: -@NM_REMOTE_SETTINGS_ERROR_CONNECTION_UNAVAILABLE: -<!-- ##### USER_FUNCTION NMRemoteSettingsSaveHostnameFunc ##### --> + +<!-- ##### USER_FUNCTION NMRemoteSettingsAddConnectionFunc ##### --> <para> </para> @settings: +@connection: @error: @user_data: -<!-- ##### MACRO NM_REMOTE_SETTINGS_BUS ##### --> +<!-- ##### USER_FUNCTION NMRemoteSettingsSaveHostnameFunc ##### --> <para> </para> +@settings: +@error: +@user_data: -<!-- ##### MACRO NM_REMOTE_SETTINGS_CAN_MODIFY ##### --> +<!-- ##### STRUCT NMRemoteSettings ##### --> <para> </para> - -<!-- ##### MACRO NM_REMOTE_SETTINGS_CONNECTIONS_READ ##### --> +<!-- ##### SIGNAL NMRemoteSettings::connections-read ##### --> <para> </para> +@nmremotesettings: the object which received the signal. - -<!-- ##### MACRO NM_REMOTE_SETTINGS_ERROR ##### --> +<!-- ##### SIGNAL NMRemoteSettings::new-connection ##### --> <para> </para> +@nmremotesettings: the object which received the signal. +@arg1: - -<!-- ##### MACRO NM_REMOTE_SETTINGS_HOSTNAME ##### --> +<!-- ##### ARG NMRemoteSettings:bus ##### --> <para> </para> +<!-- ##### ARG NMRemoteSettings:can-modify ##### --> +<para> +</para> -<!-- ##### MACRO NM_REMOTE_SETTINGS_NEW_CONNECTION ##### --> +<!-- ##### ARG NMRemoteSettings:hostname ##### --> <para> </para> +<!-- ##### ARG NMRemoteSettings:service-running ##### --> +<para> +</para> -<!-- ##### MACRO NM_REMOTE_SETTINGS_SERVICE_RUNNING ##### --> +<!-- ##### STRUCT NMRemoteSettingsClass ##### --> <para> </para> +@parent: +@new_connection: +@connections_read: +@_reserved1: +@_reserved2: +@_reserved3: +@_reserved4: +@_reserved5: +@_reserved6: - -<!-- ##### FUNCTION nm_remote_settings_add_connection ##### --> +<!-- ##### FUNCTION nm_remote_settings_new ##### --> <para> </para> -@settings: -@connection: -@callback: -@user_data: +@bus: @Returns: -<!-- ##### FUNCTION nm_remote_settings_error_quark ##### --> +<!-- ##### FUNCTION nm_remote_settings_new_async ##### --> <para> </para> -@void: -@Returns: +@bus: +@cancellable: +@callback: +@user_data: -<!-- ##### FUNCTION nm_remote_settings_get_connection_by_path ##### --> +<!-- ##### FUNCTION nm_remote_settings_new_finish ##### --> <para> </para> -@settings: -@path: +@result: +@error: @Returns: -<!-- ##### FUNCTION nm_remote_settings_get_connection_by_uuid ##### --> +<!-- ##### FUNCTION nm_remote_settings_list_connections ##### --> <para> </para> @settings: -@uuid: @Returns: -<!-- ##### FUNCTION nm_remote_settings_list_connections ##### --> +<!-- ##### FUNCTION nm_remote_settings_get_connection_by_path ##### --> <para> </para> @settings: +@path: @Returns: -<!-- ##### FUNCTION nm_remote_settings_new ##### --> +<!-- ##### FUNCTION nm_remote_settings_get_connection_by_uuid ##### --> <para> </para> -@bus: +@settings: +@uuid: @Returns: -<!-- ##### FUNCTION nm_remote_settings_new_async ##### --> +<!-- ##### FUNCTION nm_remote_settings_add_connection ##### --> <para> </para> -@bus: -@cancellable: +@settings: +@connection: @callback: @user_data: - - -<!-- ##### FUNCTION nm_remote_settings_new_finish ##### --> -<para> - -</para> - -@result: -@error: @Returns: diff --git a/docs/libnm-glib/tmpl/nm-secret-agent.sgml b/docs/libnm-glib/tmpl/nm-secret-agent.sgml index 9d23cbc5..68a5f3a1 100644 --- a/docs/libnm-glib/tmpl/nm-secret-agent.sgml +++ b/docs/libnm-glib/tmpl/nm-secret-agent.sgml @@ -22,161 +22,168 @@ NMSecretAgent <!-- ##### SECTION Image ##### --> -<!-- ##### STRUCT NMSecretAgent ##### --> +<!-- ##### MACRO NM_SECRET_AGENT_ERROR ##### --> <para> </para> -<!-- ##### SIGNAL NMSecretAgent::registration-result ##### --> + +<!-- ##### FUNCTION nm_secret_agent_error_quark ##### --> <para> </para> -@nmsecretagent: the object which received the signal. -@arg1: +@void: +@Returns: -<!-- ##### ARG NMSecretAgent:auto-register ##### --> + +<!-- ##### ENUM NMSecretAgentError ##### --> <para> </para> -<!-- ##### ARG NMSecretAgent:identifier ##### --> +@NM_SECRET_AGENT_ERROR_NOT_AUTHORIZED: +@NM_SECRET_AGENT_ERROR_INVALID_CONNECTION: +@NM_SECRET_AGENT_ERROR_USER_CANCELED: +@NM_SECRET_AGENT_ERROR_AGENT_CANCELED: +@NM_SECRET_AGENT_ERROR_INTERNAL_ERROR: +@NM_SECRET_AGENT_ERROR_NO_SECRETS: + +<!-- ##### ENUM NMSecretAgentGetSecretsFlags ##### --> <para> </para> -<!-- ##### ARG NMSecretAgent:registered ##### --> +@NM_SECRET_AGENT_GET_SECRETS_FLAG_NONE: +@NM_SECRET_AGENT_GET_SECRETS_FLAG_ALLOW_INTERACTION: +@NM_SECRET_AGENT_GET_SECRETS_FLAG_REQUEST_NEW: +@NM_SECRET_AGENT_GET_SECRETS_FLAG_USER_REQUESTED: + +<!-- ##### MACRO NM_SECRET_AGENT_IDENTIFIER ##### --> <para> </para> -<!-- ##### STRUCT NMSecretAgentClass ##### --> + + +<!-- ##### MACRO NM_SECRET_AGENT_AUTO_REGISTER ##### --> <para> </para> -@parent: -@get_secrets: -@cancel_get_secrets: -@save_secrets: -@delete_secrets: -@registration_result: -@_reserved1: -@_reserved2: -@_reserved3: -@_reserved4: -@_reserved5: -@_reserved6: -<!-- ##### USER_FUNCTION NMSecretAgentDeleteSecretsFunc ##### --> + +<!-- ##### MACRO NM_SECRET_AGENT_REGISTERED ##### --> <para> </para> -@agent: -@connection: -@error: -@user_data: -<!-- ##### ENUM NMSecretAgentError ##### --> +<!-- ##### MACRO NM_SECRET_AGENT_REGISTRATION_RESULT ##### --> <para> </para> -@NM_SECRET_AGENT_ERROR_NOT_AUTHORIZED: -@NM_SECRET_AGENT_ERROR_INVALID_CONNECTION: -@NM_SECRET_AGENT_ERROR_USER_CANCELED: -@NM_SECRET_AGENT_ERROR_AGENT_CANCELED: -@NM_SECRET_AGENT_ERROR_INTERNAL_ERROR: -@NM_SECRET_AGENT_ERROR_NO_SECRETS: -<!-- ##### ENUM NMSecretAgentGetSecretsFlags ##### --> + +<!-- ##### STRUCT NMSecretAgent ##### --> <para> </para> -@NM_SECRET_AGENT_GET_SECRETS_FLAG_NONE: -@NM_SECRET_AGENT_GET_SECRETS_FLAG_ALLOW_INTERACTION: -@NM_SECRET_AGENT_GET_SECRETS_FLAG_REQUEST_NEW: -@NM_SECRET_AGENT_GET_SECRETS_FLAG_USER_REQUESTED: -<!-- ##### USER_FUNCTION NMSecretAgentGetSecretsFunc ##### --> +<!-- ##### SIGNAL NMSecretAgent::registration-result ##### --> <para> </para> -@agent: -@connection: -@secrets: -@error: -@user_data: - +@nmsecretagent: the object which received the signal. +@arg1: -<!-- ##### USER_FUNCTION NMSecretAgentSaveSecretsFunc ##### --> +<!-- ##### ARG NMSecretAgent:auto-register ##### --> <para> </para> -@agent: -@connection: -@error: -@user_data: - - -<!-- ##### MACRO NM_SECRET_AGENT_AUTO_REGISTER ##### --> +<!-- ##### ARG NMSecretAgent:identifier ##### --> <para> </para> +<!-- ##### ARG NMSecretAgent:registered ##### --> +<para> +</para> -<!-- ##### MACRO NM_SECRET_AGENT_ERROR ##### --> +<!-- ##### USER_FUNCTION NMSecretAgentGetSecretsFunc ##### --> <para> </para> +@agent: +@connection: +@secrets: +@error: +@user_data: -<!-- ##### MACRO NM_SECRET_AGENT_IDENTIFIER ##### --> +<!-- ##### USER_FUNCTION NMSecretAgentSaveSecretsFunc ##### --> <para> </para> +@agent: +@connection: +@error: +@user_data: -<!-- ##### MACRO NM_SECRET_AGENT_REGISTERED ##### --> +<!-- ##### USER_FUNCTION NMSecretAgentDeleteSecretsFunc ##### --> <para> </para> +@agent: +@connection: +@error: +@user_data: -<!-- ##### MACRO NM_SECRET_AGENT_REGISTRATION_RESULT ##### --> +<!-- ##### STRUCT NMSecretAgentClass ##### --> <para> </para> +@parent: +@get_secrets: +@cancel_get_secrets: +@save_secrets: +@delete_secrets: +@registration_result: +@_reserved1: +@_reserved2: +@_reserved3: +@_reserved4: +@_reserved5: +@_reserved6: - -<!-- ##### FUNCTION nm_secret_agent_delete_secrets ##### --> +<!-- ##### FUNCTION nm_secret_agent_register ##### --> <para> </para> @self: -@connection: -@callback: -@user_data: +@Returns: -<!-- ##### FUNCTION nm_secret_agent_error_quark ##### --> +<!-- ##### FUNCTION nm_secret_agent_unregister ##### --> <para> </para> -@void: +@self: @Returns: @@ -203,15 +210,6 @@ NMSecretAgent @user_data: -<!-- ##### FUNCTION nm_secret_agent_register ##### --> -<para> - -</para> - -@self: -@Returns: - - <!-- ##### FUNCTION nm_secret_agent_save_secrets ##### --> <para> @@ -223,12 +221,14 @@ NMSecretAgent @user_data: -<!-- ##### FUNCTION nm_secret_agent_unregister ##### --> +<!-- ##### FUNCTION nm_secret_agent_delete_secrets ##### --> <para> </para> @self: -@Returns: +@connection: +@callback: +@user_data: diff --git a/docs/libnm-glib/tmpl/nm-vpn-connection.sgml b/docs/libnm-glib/tmpl/nm-vpn-connection.sgml index 3086909a..c20f145d 100644 --- a/docs/libnm-glib/tmpl/nm-vpn-connection.sgml +++ b/docs/libnm-glib/tmpl/nm-vpn-connection.sgml @@ -22,6 +22,20 @@ NMVPNConnection <!-- ##### SECTION Image ##### --> +<!-- ##### MACRO NM_VPN_CONNECTION_VPN_STATE ##### --> +<para> + +</para> + + + +<!-- ##### MACRO NM_VPN_CONNECTION_BANNER ##### --> +<para> + +</para> + + + <!-- ##### STRUCT NMVPNConnection ##### --> <para> @@ -61,26 +75,13 @@ NMVPNConnection @_reserved5: @_reserved6: -<!-- ##### MACRO NM_VPN_CONNECTION_BANNER ##### --> -<para> - -</para> - - - -<!-- ##### MACRO NM_VPN_CONNECTION_VPN_STATE ##### --> -<para> - -</para> - - - -<!-- ##### FUNCTION nm_vpn_connection_get_banner ##### --> +<!-- ##### FUNCTION nm_vpn_connection_new ##### --> <para> </para> -@vpn: +@connection: +@path: @Returns: @@ -93,13 +94,12 @@ NMVPNConnection @Returns: -<!-- ##### FUNCTION nm_vpn_connection_new ##### --> +<!-- ##### FUNCTION nm_vpn_connection_get_banner ##### --> <para> </para> -@connection: -@path: +@vpn: @Returns: diff --git a/docs/libnm-glib/tmpl/nm-vpn-plugin-ui-interface.sgml b/docs/libnm-glib/tmpl/nm-vpn-plugin-ui-interface.sgml index f4c724a8..f38e277d 100644 --- a/docs/libnm-glib/tmpl/nm-vpn-plugin-ui-interface.sgml +++ b/docs/libnm-glib/tmpl/nm-vpn-plugin-ui-interface.sgml @@ -1,5 +1,5 @@ <!-- ##### SECTION Title ##### --> -NMVpnPluginUiWidget +NMVpnPluginUi <!-- ##### SECTION Short_Description ##### --> @@ -22,17 +22,16 @@ NMVpnPluginUiWidget <!-- ##### SECTION Image ##### --> -<!-- ##### ENUM NMVpnPluginUiCapability ##### --> +<!-- ##### USER_FUNCTION NMVpnPluginUiFactory ##### --> <para> </para> -@NM_VPN_PLUGIN_UI_CAPABILITY_NONE: -@NM_VPN_PLUGIN_UI_CAPABILITY_IMPORT: -@NM_VPN_PLUGIN_UI_CAPABILITY_EXPORT: -@NM_VPN_PLUGIN_UI_CAPABILITY_IPV6: +@error: +@Returns: -<!-- ##### USER_FUNCTION NMVpnPluginUiFactory ##### --> + +<!-- ##### FUNCTION nm_vpn_plugin_ui_factory ##### --> <para> </para> @@ -41,104 +40,105 @@ NMVpnPluginUiWidget @Returns: -<!-- ##### STRUCT NMVpnPluginUiInterface ##### --> +<!-- ##### ENUM NMVpnPluginUiCapability ##### --> <para> </para> -@g_iface: -@ui_factory: -@get_capabilities: -@import_from_file: -@export_to_file: -@get_suggested_name: -@delete_connection: -@_reserved1: -@_reserved2: -@_reserved3: -@_reserved4: -@_reserved5: -@_reserved6: +@NM_VPN_PLUGIN_UI_CAPABILITY_NONE: +@NM_VPN_PLUGIN_UI_CAPABILITY_IMPORT: +@NM_VPN_PLUGIN_UI_CAPABILITY_EXPORT: +@NM_VPN_PLUGIN_UI_CAPABILITY_IPV6: -<!-- ##### ENUM NMVpnPluginUiInterfaceProp ##### --> +<!-- ##### MACRO NM_VPN_PLUGIN_UI_INTERFACE_NAME ##### --> <para> </para> -@NM_VPN_PLUGIN_UI_INTERFACE_PROP_NAME: -@NM_VPN_PLUGIN_UI_INTERFACE_PROP_DESC: -@NM_VPN_PLUGIN_UI_INTERFACE_PROP_SERVICE: -<!-- ##### STRUCT NMVpnPluginUiWidgetInterface ##### --> + +<!-- ##### MACRO NM_VPN_PLUGIN_UI_INTERFACE_DESC ##### --> <para> </para> -@g_iface: -@get_widget: -@update_connection: -@save_secrets: -@changed: -<!-- ##### MACRO NM_VPN_PLUGIN_UI_INTERFACE_DESC ##### --> + +<!-- ##### MACRO NM_VPN_PLUGIN_UI_INTERFACE_SERVICE ##### --> <para> </para> -<!-- ##### MACRO NM_VPN_PLUGIN_UI_INTERFACE_NAME ##### --> +<!-- ##### ENUM NMVpnPluginUiInterfaceProp ##### --> <para> </para> +@NM_VPN_PLUGIN_UI_INTERFACE_PROP_NAME: +@NM_VPN_PLUGIN_UI_INTERFACE_PROP_DESC: +@NM_VPN_PLUGIN_UI_INTERFACE_PROP_SERVICE: - -<!-- ##### MACRO NM_VPN_PLUGIN_UI_INTERFACE_SERVICE ##### --> +<!-- ##### STRUCT NMVpnPluginUiInterface ##### --> <para> </para> +@g_iface: +@ui_factory: +@get_capabilities: +@import_from_file: +@export_to_file: +@get_suggested_name: +@delete_connection: +@_reserved1: +@_reserved2: +@_reserved3: +@_reserved4: +@_reserved5: +@_reserved6: - -<!-- ##### FUNCTION nm_vpn_plugin_ui_factory ##### --> +<!-- ##### FUNCTION nm_vpn_plugin_ui_interface_ui_factory ##### --> <para> </para> +@iface: +@connection: @error: @Returns: -<!-- ##### FUNCTION nm_vpn_plugin_ui_interface_delete_connection ##### --> +<!-- ##### FUNCTION nm_vpn_plugin_ui_interface_get_capabilities ##### --> <para> </para> @iface: -@connection: -@error: @Returns: -<!-- ##### FUNCTION nm_vpn_plugin_ui_interface_export ##### --> +<!-- ##### FUNCTION nm_vpn_plugin_ui_interface_import ##### --> <para> </para> @iface: @path: -@connection: @error: @Returns: -<!-- ##### FUNCTION nm_vpn_plugin_ui_interface_get_capabilities ##### --> +<!-- ##### FUNCTION nm_vpn_plugin_ui_interface_export ##### --> <para> </para> @iface: +@path: +@connection: +@error: @Returns: @@ -152,27 +152,27 @@ NMVpnPluginUiWidget @Returns: -<!-- ##### FUNCTION nm_vpn_plugin_ui_interface_import ##### --> +<!-- ##### FUNCTION nm_vpn_plugin_ui_interface_delete_connection ##### --> <para> </para> @iface: -@path: +@connection: @error: @Returns: -<!-- ##### FUNCTION nm_vpn_plugin_ui_interface_ui_factory ##### --> +<!-- ##### STRUCT NMVpnPluginUiWidgetInterface ##### --> <para> </para> -@iface: -@connection: -@error: -@Returns: - +@g_iface: +@get_widget: +@update_connection: +@save_secrets: +@changed: <!-- ##### FUNCTION nm_vpn_plugin_ui_widget_interface_get_widget ##### --> <para> @@ -183,7 +183,7 @@ NMVpnPluginUiWidget @Returns: -<!-- ##### FUNCTION nm_vpn_plugin_ui_widget_interface_save_secrets ##### --> +<!-- ##### FUNCTION nm_vpn_plugin_ui_widget_interface_update_connection ##### --> <para> </para> @@ -194,7 +194,7 @@ NMVpnPluginUiWidget @Returns: -<!-- ##### FUNCTION nm_vpn_plugin_ui_widget_interface_update_connection ##### --> +<!-- ##### FUNCTION nm_vpn_plugin_ui_widget_interface_save_secrets ##### --> <para> </para> diff --git a/docs/libnm-glib/tmpl/nm-vpn-plugin-utils.sgml b/docs/libnm-glib/tmpl/nm-vpn-plugin-utils.sgml index ed0ab40b..3a6536da 100644 --- a/docs/libnm-glib/tmpl/nm-vpn-plugin-utils.sgml +++ b/docs/libnm-glib/tmpl/nm-vpn-plugin-utils.sgml @@ -22,25 +22,25 @@ nm-vpn-plugin-utils <!-- ##### SECTION Image ##### --> -<!-- ##### FUNCTION nm_vpn_plugin_utils_get_secret_flags ##### --> +<!-- ##### FUNCTION nm_vpn_plugin_utils_read_vpn_details ##### --> <para> </para> -@data: -@secret_name: -@out_flags: +@fd: +@out_data: +@out_secrets: @Returns: -<!-- ##### FUNCTION nm_vpn_plugin_utils_read_vpn_details ##### --> +<!-- ##### FUNCTION nm_vpn_plugin_utils_get_secret_flags ##### --> <para> </para> -@fd: -@out_data: -@out_secrets: +@data: +@secret_name: +@out_flags: @Returns: diff --git a/docs/libnm-glib/tmpl/nm-vpn-plugin.sgml b/docs/libnm-glib/tmpl/nm-vpn-plugin.sgml index 7ece0f79..8c738c54 100644 --- a/docs/libnm-glib/tmpl/nm-vpn-plugin.sgml +++ b/docs/libnm-glib/tmpl/nm-vpn-plugin.sgml @@ -22,33 +22,19 @@ NMVPNPlugin <!-- ##### SECTION Image ##### --> -<!-- ##### STRUCT NMVPNPlugin ##### --> +<!-- ##### MACRO NM_VPN_PLUGIN_DBUS_SERVICE_NAME ##### --> <para> </para> -@parent: -<!-- ##### STRUCT NMVPNPluginClass ##### --> + +<!-- ##### MACRO NM_VPN_PLUGIN_STATE ##### --> <para> </para> -@parent: -@connect: -@need_secrets: -@disconnect: -@state_changed: -@ip4_config: -@login_banner: -@failure: -@quit: -@config: -@ip6_config: -@_reserved1: -@_reserved2: -@_reserved3: -@_reserved4: + <!-- ##### ENUM NMVPNPluginError ##### --> <para> @@ -65,64 +51,86 @@ NMVPNPlugin @NM_VPN_PLUGIN_ERROR_LAUNCH_FAILED: @NM_VPN_PLUGIN_ERROR_CONNECTION_INVALID: -<!-- ##### MACRO NM_VPN_PLUGIN_DBUS_SERVICE_NAME ##### --> +<!-- ##### STRUCT NMVPNPlugin ##### --> <para> </para> +@parent: + +<!-- ##### STRUCT NMVPNPluginClass ##### --> +<para> +</para> -<!-- ##### MACRO NM_VPN_PLUGIN_STATE ##### --> +@parent: +@connect: +@need_secrets: +@disconnect: +@state_changed: +@ip4_config: +@login_banner: +@failure: +@quit: +@config: +@ip6_config: +@_reserved1: +@_reserved2: +@_reserved3: +@_reserved4: + +<!-- ##### FUNCTION nm_vpn_plugin_error_quark ##### --> <para> </para> +@void: +@Returns: -<!-- ##### FUNCTION nm_vpn_plugin_disconnect ##### --> +<!-- ##### FUNCTION nm_vpn_plugin_get_connection ##### --> <para> </para> @plugin: -@err: @Returns: -<!-- ##### FUNCTION nm_vpn_plugin_error_quark ##### --> +<!-- ##### FUNCTION nm_vpn_plugin_get_state ##### --> <para> </para> -@void: +@plugin: @Returns: -<!-- ##### FUNCTION nm_vpn_plugin_failure ##### --> +<!-- ##### FUNCTION nm_vpn_plugin_set_state ##### --> <para> </para> @plugin: -@reason: +@state: -<!-- ##### FUNCTION nm_vpn_plugin_get_connection ##### --> +<!-- ##### FUNCTION nm_vpn_plugin_set_login_banner ##### --> <para> </para> @plugin: -@Returns: +@banner: -<!-- ##### FUNCTION nm_vpn_plugin_get_state ##### --> +<!-- ##### FUNCTION nm_vpn_plugin_failure ##### --> <para> </para> @plugin: -@Returns: +@reason: <!-- ##### FUNCTION nm_vpn_plugin_set_config ##### --> @@ -152,21 +160,13 @@ NMVPNPlugin @ip6_config: -<!-- ##### FUNCTION nm_vpn_plugin_set_login_banner ##### --> -<para> - -</para> - -@plugin: -@banner: - - -<!-- ##### FUNCTION nm_vpn_plugin_set_state ##### --> +<!-- ##### FUNCTION nm_vpn_plugin_disconnect ##### --> <para> </para> @plugin: -@state: +@err: +@Returns: diff --git a/docs/libnm-glib/tmpl/nm-wimax-nsp.sgml b/docs/libnm-glib/tmpl/nm-wimax-nsp.sgml index f5dca7a3..f270a1d2 100644 --- a/docs/libnm-glib/tmpl/nm-wimax-nsp.sgml +++ b/docs/libnm-glib/tmpl/nm-wimax-nsp.sgml @@ -22,39 +22,26 @@ NMWimaxNsp <!-- ##### SECTION Image ##### --> -<!-- ##### STRUCT NMWimaxNsp ##### --> +<!-- ##### MACRO NM_WIMAX_NSP_NAME ##### --> <para> </para> -<!-- ##### ARG NMWimaxNsp:name ##### --> -<para> - -</para> -<!-- ##### ARG NMWimaxNsp:network-type ##### --> +<!-- ##### MACRO NM_WIMAX_NSP_SIGNAL_QUALITY ##### --> <para> </para> -<!-- ##### ARG NMWimaxNsp:signal-quality ##### --> -<para> -</para> -<!-- ##### STRUCT NMWimaxNspClass ##### --> +<!-- ##### MACRO NM_WIMAX_NSP_NETWORK_TYPE ##### --> <para> </para> -@parent: -@_reserved1: -@_reserved2: -@_reserved3: -@_reserved4: -@_reserved5: -@_reserved6: + <!-- ##### ENUM NMWimaxNspNetworkType ##### --> <para> @@ -66,48 +53,60 @@ NMWimaxNsp @NM_WIMAX_NSP_NETWORK_TYPE_PARTNER: @NM_WIMAX_NSP_NETWORK_TYPE_ROAMING_PARTNER: -<!-- ##### MACRO NM_WIMAX_NSP_NAME ##### --> +<!-- ##### STRUCT NMWimaxNsp ##### --> <para> </para> - -<!-- ##### MACRO NM_WIMAX_NSP_NETWORK_TYPE ##### --> +<!-- ##### ARG NMWimaxNsp:name ##### --> <para> </para> +<!-- ##### ARG NMWimaxNsp:network-type ##### --> +<para> +</para> -<!-- ##### MACRO NM_WIMAX_NSP_SIGNAL_QUALITY ##### --> +<!-- ##### ARG NMWimaxNsp:signal-quality ##### --> <para> </para> +<!-- ##### STRUCT NMWimaxNspClass ##### --> +<para> +</para> -<!-- ##### FUNCTION nm_wimax_nsp_connection_valid ##### --> +@parent: +@_reserved1: +@_reserved2: +@_reserved3: +@_reserved4: +@_reserved5: +@_reserved6: + +<!-- ##### FUNCTION nm_wimax_nsp_new ##### --> <para> </para> -@nsp: @connection: +@path: @Returns: -<!-- ##### FUNCTION nm_wimax_nsp_filter_connections ##### --> +<!-- ##### FUNCTION nm_wimax_nsp_get_name ##### --> <para> </para> @nsp: -@connections: @Returns: -<!-- ##### FUNCTION nm_wimax_nsp_get_name ##### --> +<!-- ##### FUNCTION nm_wimax_nsp_get_signal_quality ##### --> <para> </para> @@ -125,22 +124,23 @@ NMWimaxNsp @Returns: -<!-- ##### FUNCTION nm_wimax_nsp_get_signal_quality ##### --> +<!-- ##### FUNCTION nm_wimax_nsp_filter_connections ##### --> <para> </para> @nsp: +@connections: @Returns: -<!-- ##### FUNCTION nm_wimax_nsp_new ##### --> +<!-- ##### FUNCTION nm_wimax_nsp_connection_valid ##### --> <para> </para> +@nsp: @connection: -@path: @Returns: |