diff options
Diffstat (limited to 'src/devices/nm-device-ethernet-utils.c')
| -rw-r--r-- | src/devices/nm-device-ethernet-utils.c | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/src/devices/nm-device-ethernet-utils.c b/src/devices/nm-device-ethernet-utils.c index 298e6dff95..8decbff074 100644 --- a/src/devices/nm-device-ethernet-utils.c +++ b/src/devices/nm-device-ethernet-utils.c @@ -32,6 +32,7 @@ nm_device_ethernet_utils_get_default_wired_name (NMConnection *const *connection int i; /* Find the next available unique connection name */ +<<<<<<< HEAD for (i = 1; i <= 10000; i++) { temp = g_strdup_printf (_("Wired connection %d"), i); for (j = 0; connections[j]; j++) { @@ -39,6 +40,25 @@ nm_device_ethernet_utils_get_default_wired_name (NMConnection *const *connection g_free (temp); goto next; } +||||||| merged common ancestors + for (i = 1; TRUE; i++) { + char *temp; + + temp = g_strdup_printf (_("Wired connection %u"), i); + if ( name_idx + && g_hash_table_contains (name_idx, temp)) { + g_free (temp); + continue; +======= + for (i = 1; TRUE; i++) { + char *temp; + + temp = g_strdup_printf ("Wired connection %u", i); + if ( name_idx + && g_hash_table_contains (name_idx, temp)) { + g_free (temp); + continue; +>>>>>>> core: don't localize strings for daemon } return temp; next: |