diff options
| -rw-r--r-- | libnm-util/libnm-util.ver | 1 | ||||
| -rw-r--r-- | libnm-util/nm-connection.c | 18 | ||||
| -rw-r--r-- | libnm-util/nm-connection.h | 2 | ||||
| -rw-r--r-- | src/nm-device-bt.c | 2 | ||||
| -rw-r--r-- | src/settings/plugins/keyfile/tests/test-keyfile.c | 4 |
5 files changed, 24 insertions, 3 deletions
diff --git a/libnm-util/libnm-util.ver b/libnm-util/libnm-util.ver index 82b79d78b7..7ec6b43a23 100644 --- a/libnm-util/libnm-util.ver +++ b/libnm-util/libnm-util.ver @@ -27,6 +27,7 @@ global: nm_connection_get_setting_olpc_mesh; nm_connection_get_setting_ppp; nm_connection_get_setting_pppoe; + nm_connection_get_setting_serial; nm_connection_get_setting_vpn; nm_connection_get_setting_wimax; nm_connection_get_setting_wired; diff --git a/libnm-util/nm-connection.c b/libnm-util/nm-connection.c index ae8c9aa903..9bae63b56b 100644 --- a/libnm-util/nm-connection.c +++ b/libnm-util/nm-connection.c @@ -43,6 +43,7 @@ #include "nm-setting-wired.h" #include "nm-setting-wireless.h" #include "nm-setting-wireless-security.h" +#include "nm-setting-serial.h" #include "nm-setting-vpn.h" #include "nm-setting-olpc-mesh.h" #include "nm-setting-bond.h" @@ -1521,6 +1522,23 @@ nm_connection_get_setting_pppoe (NMConnection *connection) } /** + * nm_connection_get_setting_serial: + * @connection: the #NMConnection + * + * A shortcut to return any #NMSettingSerial the connection might contain. + * + * Returns: (transfer none): an #NMSettingSerial if the connection contains one, otherwise NULL + **/ +NMSettingSerial * +nm_connection_get_setting_serial (NMConnection *connection) +{ + g_return_val_if_fail (connection != NULL, NULL); + g_return_val_if_fail (NM_IS_CONNECTION (connection), NULL); + + return (NMSettingSerial *) nm_connection_get_setting (connection, NM_TYPE_SETTING_SERIAL); +} + +/** * nm_connection_get_setting_vpn: * @connection: the #NMConnection * diff --git a/libnm-util/nm-connection.h b/libnm-util/nm-connection.h index 0f3651a94f..abe74d2888 100644 --- a/libnm-util/nm-connection.h +++ b/libnm-util/nm-connection.h @@ -42,6 +42,7 @@ #include <nm-setting-olpc-mesh.h> #include <nm-setting-ppp.h> #include <nm-setting-pppoe.h> +#include <nm-setting-serial.h> #include <nm-setting-vpn.h> #include <nm-setting-wimax.h> #include <nm-setting-wired.h> @@ -195,6 +196,7 @@ NMSettingIP6Config * nm_connection_get_setting_ip6_config (NMConnec NMSettingOlpcMesh * nm_connection_get_setting_olpc_mesh (NMConnection *connection); NMSettingPPP * nm_connection_get_setting_ppp (NMConnection *connection); NMSettingPPPOE * nm_connection_get_setting_pppoe (NMConnection *connection); +NMSettingSerial * nm_connection_get_setting_serial (NMConnection *connection); NMSettingVPN * nm_connection_get_setting_vpn (NMConnection *connection); NMSettingWimax * nm_connection_get_setting_wimax (NMConnection *connection); NMSettingWired * nm_connection_get_setting_wired (NMConnection *connection); diff --git a/src/nm-device-bt.c b/src/nm-device-bt.c index 9feff50fb1..5af8e2b6ea 100644 --- a/src/nm-device-bt.c +++ b/src/nm-device-bt.c @@ -277,7 +277,7 @@ real_complete_connection (NMDevice *device, s_gsm = nm_connection_get_setting_gsm (connection); s_cdma = nm_connection_get_setting_cdma (connection); - s_serial = (NMSettingSerial *) nm_connection_get_setting (connection, NM_TYPE_SETTING_SERIAL); + s_serial = nm_connection_get_setting_serial (connection); s_ppp = nm_connection_get_setting_ppp (connection); s_bt = nm_connection_get_setting_bluetooth (connection); diff --git a/src/settings/plugins/keyfile/tests/test-keyfile.c b/src/settings/plugins/keyfile/tests/test-keyfile.c index 7dbcc0efd1..47501ef0c5 100644 --- a/src/settings/plugins/keyfile/tests/test-keyfile.c +++ b/src/settings/plugins/keyfile/tests/test-keyfile.c @@ -1954,7 +1954,7 @@ test_read_bt_dun_connection (void) /* ===== SERIAL SETTING ===== */ - s_serial = NM_SETTING_SERIAL (nm_connection_get_setting (connection, NM_TYPE_SETTING_SERIAL)); + s_serial = nm_connection_get_setting_serial (connection); ASSERT (s_serial != NULL, "connection-verify-serial", "failed to verify %s: missing %s setting", TEST_BT_DUN_FILE, @@ -2217,7 +2217,7 @@ test_read_gsm_connection (void) /* ===== SERIAL SETTING ===== */ - s_serial = NM_SETTING_SERIAL (nm_connection_get_setting (connection, NM_TYPE_SETTING_SERIAL)); + s_serial = nm_connection_get_setting_serial (connection); ASSERT (s_serial != NULL, "connection-verify-serial", "failed to verify %s: missing %s setting", TEST_GSM_FILE, |