diff options
| author | Michael Biebl <biebl@debian.org> | 2013-02-09 03:22:03 +0100 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2013-02-09 03:22:03 +0100 |
| commit | 78efcd2dfec5b6c56c50b1f8e44ed7c61c14553d (patch) | |
| tree | c21aecab13151f626c3b2230ca21cda818c99484 /src/modem-manager/nm-modem-cdma.c | |
| parent | 681370ed77af598691a15eba55b17beb2edc9459 (diff) | |
| parent | e17c5736fc3722ce51cb33f3edb203960125a4c1 (diff) | |
Merge tag 'upstream/0.9.7.997' into experimental
Upstream version 0.9.7.997
Diffstat (limited to 'src/modem-manager/nm-modem-cdma.c')
| -rw-r--r-- | src/modem-manager/nm-modem-cdma.c | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/src/modem-manager/nm-modem-cdma.c b/src/modem-manager/nm-modem-cdma.c index 73c87c28..6bed8c2a 100644 --- a/src/modem-manager/nm-modem-cdma.c +++ b/src/modem-manager/nm-modem-cdma.c @@ -201,18 +201,9 @@ get_best_auto_connection (NMModem *modem, for (iter = connections; iter; iter = g_slist_next (iter)) { NMConnection *connection = NM_CONNECTION (iter->data); - NMSettingConnection *s_con; - s_con = nm_connection_get_setting_connection (connection); - g_assert (s_con); - - if (!nm_setting_connection_get_autoconnect (s_con)) - continue; - - if (strcmp (nm_setting_connection_get_connection_type (s_con), NM_SETTING_CDMA_SETTING_NAME)) - continue; - - return connection; + if (nm_connection_is_type (connection, NM_SETTING_CDMA_SETTING_NAME)) + return connection; } return NULL; } |