diff options
Diffstat (limited to 'libnm-util/nm-connection.c')
| -rw-r--r-- | libnm-util/nm-connection.c | 64 |
1 files changed, 32 insertions, 32 deletions
diff --git a/libnm-util/nm-connection.c b/libnm-util/nm-connection.c index 47a9ec09..15b1685f 100644 --- a/libnm-util/nm-connection.c +++ b/libnm-util/nm-connection.c @@ -285,7 +285,7 @@ nm_connection_lookup_setting_type_by_quark (GQuark error_quark) * * Create a new #NMSetting object of the desired type, given a setting name. * - * Returns: (transfer full): the new setting object, or NULL if the setting name was unknown + * Returns: (transfer full): the new setting object, or %NULL if the setting name was unknown **/ NMSetting * nm_connection_create_setting (const char *name) @@ -361,7 +361,7 @@ nm_connection_remove_setting (NMConnection *connection, GType setting_type) * Gets the #NMSetting with the given #GType, if one has been previously added * to the #NMConnection. * - * Returns: (transfer none): the #NMSetting, or NULL if no setting of that type was previously + * Returns: (transfer none): the #NMSetting, or %NULL if no setting of that type was previously * added to the #NMConnection **/ NMSetting * @@ -382,7 +382,7 @@ nm_connection_get_setting (NMConnection *connection, GType setting_type) * Gets the #NMSetting with the given name, if one has been previously added * the the #NMConnection. * - * Returns: (transfer none): the #NMSetting, or NULL if no setting with that name was previously + * Returns: (transfer none): the #NMSetting, or %NULL if no setting with that name was previously * added to the #NMConnection **/ NMSetting * @@ -821,12 +821,12 @@ setting_priority_compare (gconstpointer a, gconstpointer b) /** * nm_connection_need_secrets: * @connection: the #NMConnection - * @hints: (out callee-allocates) (element-type utf8) (allow-none) (transfer full): - * the address of a pointer to a #GPtrArray, initialized to NULL, which on + * @hints: (out) (element-type utf8) (allow-none) (transfer container): + * the address of a pointer to a #GPtrArray, initialized to %NULL, which on * return points to an allocated #GPtrArray containing the property names of * secrets of the #NMSetting which may be required; the caller owns the array - * and must free the each array element with g_free(), as well as the array - * itself with g_ptr_array_free() + * and must free the array itself with g_ptr_array_free(), but not free its + * elements * * Returns the name of the first setting object in the connection which would * need secrets to make a successful connection. The returned hints are only @@ -1112,9 +1112,9 @@ nm_connection_get_path (NMConnection *connection) * Returns the name of the virtual kernel interface which the connection * needs to use if specified in the settings. This function abstracts all * connection types which require this functionality. For all other - * connection types, this function will return NULL. + * connection types, this function will return %NULL. * - * Returns: Name of the kernel interface or NULL + * Returns: Name of the kernel interface or %NULL */ const char * nm_connection_get_virtual_iface_name (NMConnection *connection) @@ -1152,7 +1152,7 @@ nm_connection_new (void) * nm_connection_to_hash() for a description of the expected hash table. * * Returns: the new #NMConnection object, populated with settings created - * from the values in the hash table, or NULL if the connection failed to + * from the values in the hash table, or %NULL if the connection failed to * validate **/ NMConnection * @@ -1257,7 +1257,7 @@ nm_connection_get_id (NMConnection *connection) * * A shortcut to return any #NMSetting8021x the connection might contain. * - * Returns: (transfer none): an #NMSetting8021x if the connection contains one, otherwise NULL + * Returns: (transfer none): an #NMSetting8021x if the connection contains one, otherwise %NULL **/ NMSetting8021x * nm_connection_get_setting_802_1x (NMConnection *connection) @@ -1274,7 +1274,7 @@ nm_connection_get_setting_802_1x (NMConnection *connection) * * A shortcut to return any #NMSettingBluetooth the connection might contain. * - * Returns: (transfer none): an #NMSettingBluetooth if the connection contains one, otherwise NULL + * Returns: (transfer none): an #NMSettingBluetooth if the connection contains one, otherwise %NULL **/ NMSettingBluetooth * nm_connection_get_setting_bluetooth (NMConnection *connection) @@ -1291,7 +1291,7 @@ nm_connection_get_setting_bluetooth (NMConnection *connection) * * A shortcut to return any #NMSettingBond the connection might contain. * - * Returns: (transfer none): an #NMSettingBond if the connection contains one, otherwise NULL + * Returns: (transfer none): an #NMSettingBond if the connection contains one, otherwise %NULL **/ NMSettingBond * nm_connection_get_setting_bond (NMConnection *connection) @@ -1308,7 +1308,7 @@ nm_connection_get_setting_bond (NMConnection *connection) * * A shortcut to return any #NMSettingBridge the connection might contain. * - * Returns: (transfer none): an #NMSettingBridge if the connection contains one, otherwise NULL + * Returns: (transfer none): an #NMSettingBridge if the connection contains one, otherwise %NULL **/ NMSettingBridge * nm_connection_get_setting_bridge (NMConnection *connection) @@ -1325,7 +1325,7 @@ nm_connection_get_setting_bridge (NMConnection *connection) * * A shortcut to return any #NMSettingCdma the connection might contain. * - * Returns: (transfer none): an #NMSettingCdma if the connection contains one, otherwise NULL + * Returns: (transfer none): an #NMSettingCdma if the connection contains one, otherwise %NULL **/ NMSettingCdma * nm_connection_get_setting_cdma (NMConnection *connection) @@ -1342,7 +1342,7 @@ nm_connection_get_setting_cdma (NMConnection *connection) * * A shortcut to return any #NMSettingConnection the connection might contain. * - * Returns: (transfer none): an #NMSettingConnection if the connection contains one, otherwise NULL + * Returns: (transfer none): an #NMSettingConnection if the connection contains one, otherwise %NULL **/ NMSettingConnection * nm_connection_get_setting_connection (NMConnection *connection) @@ -1359,7 +1359,7 @@ nm_connection_get_setting_connection (NMConnection *connection) * * A shortcut to return any #NMSettingGsm the connection might contain. * - * Returns: (transfer none): an #NMSettingGsm if the connection contains one, otherwise NULL + * Returns: (transfer none): an #NMSettingGsm if the connection contains one, otherwise %NULL **/ NMSettingGsm * nm_connection_get_setting_gsm (NMConnection *connection) @@ -1376,7 +1376,7 @@ nm_connection_get_setting_gsm (NMConnection *connection) * * A shortcut to return any #NMSettingInfiniband the connection might contain. * - * Returns: (transfer none): an #NMSettingInfiniband if the connection contains one, otherwise NULL + * Returns: (transfer none): an #NMSettingInfiniband if the connection contains one, otherwise %NULL **/ NMSettingInfiniband * nm_connection_get_setting_infiniband (NMConnection *connection) @@ -1393,7 +1393,7 @@ nm_connection_get_setting_infiniband (NMConnection *connection) * * A shortcut to return any #NMSettingIP4Config the connection might contain. * - * Returns: (transfer none): an #NMSettingIP4Config if the connection contains one, otherwise NULL + * Returns: (transfer none): an #NMSettingIP4Config if the connection contains one, otherwise %NULL **/ NMSettingIP4Config * nm_connection_get_setting_ip4_config (NMConnection *connection) @@ -1410,7 +1410,7 @@ nm_connection_get_setting_ip4_config (NMConnection *connection) * * A shortcut to return any #NMSettingIP6Config the connection might contain. * - * Returns: (transfer none): an #NMSettingIP6Config if the connection contains one, otherwise NULL + * Returns: (transfer none): an #NMSettingIP6Config if the connection contains one, otherwise %NULL **/ NMSettingIP6Config * nm_connection_get_setting_ip6_config (NMConnection *connection) @@ -1427,7 +1427,7 @@ nm_connection_get_setting_ip6_config (NMConnection *connection) * * A shortcut to return any #NMSettingOlpcMesh the connection might contain. * - * Returns: (transfer none): an #NMSettingOlpcMesh if the connection contains one, otherwise NULL + * Returns: (transfer none): an #NMSettingOlpcMesh if the connection contains one, otherwise %NULL **/ NMSettingOlpcMesh * nm_connection_get_setting_olpc_mesh (NMConnection *connection) @@ -1444,7 +1444,7 @@ nm_connection_get_setting_olpc_mesh (NMConnection *connection) * * A shortcut to return any #NMSettingPPP the connection might contain. * - * Returns: (transfer none): an #NMSettingPPP if the connection contains one, otherwise NULL + * Returns: (transfer none): an #NMSettingPPP if the connection contains one, otherwise %NULL **/ NMSettingPPP * nm_connection_get_setting_ppp (NMConnection *connection) @@ -1461,7 +1461,7 @@ nm_connection_get_setting_ppp (NMConnection *connection) * * A shortcut to return any #NMSettingPPPOE the connection might contain. * - * Returns: (transfer none): an #NMSettingPPPOE if the connection contains one, otherwise NULL + * Returns: (transfer none): an #NMSettingPPPOE if the connection contains one, otherwise %NULL **/ NMSettingPPPOE * nm_connection_get_setting_pppoe (NMConnection *connection) @@ -1478,7 +1478,7 @@ nm_connection_get_setting_pppoe (NMConnection *connection) * * A shortcut to return any #NMSettingSerial the connection might contain. * - * Returns: (transfer none): an #NMSettingSerial if the connection contains one, otherwise NULL + * Returns: (transfer none): an #NMSettingSerial if the connection contains one, otherwise %NULL **/ NMSettingSerial * nm_connection_get_setting_serial (NMConnection *connection) @@ -1495,7 +1495,7 @@ nm_connection_get_setting_serial (NMConnection *connection) * * A shortcut to return any #NMSettingVPN the connection might contain. * - * Returns: (transfer none): an #NMSettingVPN if the connection contains one, otherwise NULL + * Returns: (transfer none): an #NMSettingVPN if the connection contains one, otherwise %NULL **/ NMSettingVPN * nm_connection_get_setting_vpn (NMConnection *connection) @@ -1512,7 +1512,7 @@ nm_connection_get_setting_vpn (NMConnection *connection) * * A shortcut to return any #NMSettingWimax the connection might contain. * - * Returns: (transfer none): an #NMSettingWimax if the connection contains one, otherwise NULL + * Returns: (transfer none): an #NMSettingWimax if the connection contains one, otherwise %NULL **/ NMSettingWimax * nm_connection_get_setting_wimax (NMConnection *connection) @@ -1529,7 +1529,7 @@ nm_connection_get_setting_wimax (NMConnection *connection) * * A shortcut to return any #NMSettingWired the connection might contain. * - * Returns: (transfer none): an #NMSettingWired if the connection contains one, otherwise NULL + * Returns: (transfer none): an #NMSettingWired if the connection contains one, otherwise %NULL **/ NMSettingWired * nm_connection_get_setting_wired (NMConnection *connection) @@ -1546,7 +1546,7 @@ nm_connection_get_setting_wired (NMConnection *connection) * * A shortcut to return any #NMSettingAdsl the connection might contain. * - * Returns: (transfer none): an #NMSettingAdsl if the connection contains one, otherwise NULL + * Returns: (transfer none): an #NMSettingAdsl if the connection contains one, otherwise %NULL **/ NMSettingAdsl * nm_connection_get_setting_adsl (NMConnection *connection) @@ -1563,7 +1563,7 @@ nm_connection_get_setting_adsl (NMConnection *connection) * * A shortcut to return any #NMSettingWireless the connection might contain. * - * Returns: (transfer none): an #NMSettingWireless if the connection contains one, otherwise NULL + * Returns: (transfer none): an #NMSettingWireless if the connection contains one, otherwise %NULL **/ NMSettingWireless * nm_connection_get_setting_wireless (NMConnection *connection) @@ -1580,7 +1580,7 @@ nm_connection_get_setting_wireless (NMConnection *connection) * * A shortcut to return any #NMSettingWirelessSecurity the connection might contain. * - * Returns: (transfer none): an #NMSettingWirelessSecurity if the connection contains one, otherwise NULL + * Returns: (transfer none): an #NMSettingWirelessSecurity if the connection contains one, otherwise %NULL **/ NMSettingWirelessSecurity * nm_connection_get_setting_wireless_security (NMConnection *connection) @@ -1597,7 +1597,7 @@ nm_connection_get_setting_wireless_security (NMConnection *connection) * * A shortcut to return any #NMSettingBridgePort the connection might contain. * - * Returns: (transfer none): an #NMSettingBridgePort if the connection contains one, otherwise NULL + * Returns: (transfer none): an #NMSettingBridgePort if the connection contains one, otherwise %NULL **/ NMSettingBridgePort * nm_connection_get_setting_bridge_port (NMConnection *connection) @@ -1614,7 +1614,7 @@ nm_connection_get_setting_bridge_port (NMConnection *connection) * * A shortcut to return any #NMSettingVlan the connection might contain. * - * Returns: (transfer none): an #NMSettingVlan if the connection contains one, otherwise NULL + * Returns: (transfer none): an #NMSettingVlan if the connection contains one, otherwise %NULL **/ NMSettingVlan * nm_connection_get_setting_vlan (NMConnection *connection) |