diff options
| author | Michael Biebl <biebl@debian.org> | 2012-08-07 14:23:39 +0200 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2012-08-07 14:23:39 +0200 |
| commit | 543d05fc6d12cc608dc37ae97d4843431c6de4a8 (patch) | |
| tree | def16257d58256bc116737bdc04edce693a656de /libnm-util/nm-connection.c | |
| parent | 73f59c42ef878adf32efe8c7c4cb0d50ea2d04a1 (diff) | |
| parent | 7f1d08cf21e97f5e60d4636bb1e6c287c34ee2df (diff) | |
Merge tag 'upstream/0.9.5.96' into experimental
Upstream version 0.9.5.96
Diffstat (limited to 'libnm-util/nm-connection.c')
| -rw-r--r-- | libnm-util/nm-connection.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/libnm-util/nm-connection.c b/libnm-util/nm-connection.c index 80a4996d..e24ec148 100644 --- a/libnm-util/nm-connection.c +++ b/libnm-util/nm-connection.c @@ -486,14 +486,9 @@ nm_connection_get_setting_by_name (NMConnection *connection, const char *name) return type ? nm_connection_get_setting (connection, type) : NULL; } -/** - * nm_connection_get_type_setting: - * @connection: a #NMConnection - * - * Returns: (transfer none): the #NMSetting of the connection base type - */ +/* not exposed until we actually need it */ static NMSetting * -nm_connection_get_type_setting (NMConnection *connection) +_get_type_setting (NMConnection *connection) { NMSettingConnection *s_con; const char *type; @@ -1223,7 +1218,7 @@ nm_connection_get_virtual_iface_name (NMConnection *connection) g_return_val_if_fail (NM_IS_CONNECTION (connection), NULL); - base = nm_connection_get_type_setting (connection); + base = _get_type_setting (connection); g_assert (base); return nm_setting_get_virtual_iface_name (base); |