device: _get_available_connections() with _get_best_connection()

[NetworkManager.git] / src / nm-manager.c

diff --git a/src/nm-manager.c b/src/nm-manager.c
index 0ccb987..2490d91 100644 (file)
--- a/src/nm-manager.c
+++ b/src/nm-manager.c
@@ -3325,11 +3325,15 @@ impl_manager_activate_connection (NMManager *self,
         * regardless of whether that connection is autoconnect-enabled or not
         * (since this is an explicit request, not an auto-activation request).
         */
-       if (!connection_path) {
-               GPtrArray *available;
-               guint64 best_timestamp = 0;
-               guint i;
-
+       if (connection_path) {
+               connection = nm_settings_get_connection_by_path (priv->settings, connection_path);
+               if (!connection) {
+                       error = g_error_new_literal (NM_MANAGER_ERROR,
+                                                    NM_MANAGER_ERROR_UNKNOWN_CONNECTION,
+                                                    "Connection could not be found.");
+                       goto error;
+               }
+       } else {
                /* If no connection is given, find a suitable connection for the given device path */
                if (!device_path) {
                        error = g_error_new_literal (NM_MANAGER_ERROR, NM_MANAGER_ERROR_UNKNOWN_DEVICE,
@@ -3343,36 +3347,9 @@ impl_manager_activate_connection (NMManager *self,
                        goto error;
                }
 
-               available = nm_device_get_available_connections (device, specific_object_path);
-               for (i = 0; available && i < available->len; i++) {
-                       NMSettingsConnection *candidate = g_ptr_array_index (available, i);
-                       guint64 candidate_timestamp = 0;
-
-                       nm_settings_connection_get_timestamp (candidate, &candidate_timestamp);
-                       if (!connection_path || (candidate_timestamp > best_timestamp)) {
-                               connection_path = nm_connection_get_path (NM_CONNECTION (candidate));
-                               best_timestamp = candidate_timestamp;
-                       }
-               }
-
-               if (available)
-                       g_ptr_array_free (available, TRUE);
-
-               if (!connection_path) {
-                       error = g_error_new_literal (NM_MANAGER_ERROR,
-                                                    NM_MANAGER_ERROR_UNKNOWN_CONNECTION,
-                                                    "The device has no connections available.");
+               connection = nm_device_get_best_connection (device, specific_object_path, &error);
+               if (!connection)
                        goto error;
-               }
-       }
-
-       g_assert (connection_path);
-       connection = nm_settings_get_connection_by_path (priv->settings, connection_path);
-       if (!connection) {
-               error = g_error_new_literal (NM_MANAGER_ERROR,
-                                            NM_MANAGER_ERROR_UNKNOWN_CONNECTION,
-                                            "Connection could not be found.");
-               goto error;
        }
 
        subject = validate_activation_request (self,